diff --git a/.env-template b/.env-template index ae902aa9..7830e248 100644 --- a/.env-template +++ b/.env-template @@ -1,4 +1,4 @@ -## SECRETS --================================== +## SECRETS -------------------------------- RABBITMQ_DEFAULT_USER= RABBITMQ_DEFAULT_PASS= # --- @@ -15,7 +15,7 @@ DJANGO_SUPER_PASSWORD= DJANGO_SECRET_KEY= # --- -## SETTINGS --================================== +## SETTINGS -------------------------------- RABBITMQ_WEB_UI_PORT=15672 RABBITMQ_PORT=5672 RABBITMQ_HOST=rabbitmq @@ -26,7 +26,10 @@ POSTGRES_PORT=5432 NGINX_HTTP_PORT=80 NGINX_HTTPS_PORT=443 # --- +REDIS_USER=default REDIS_PORT=6379 +REDIS_DB=0 +REDIS_HOST=redis REDIS_MAXMEMORY=256mb REDIS_COMMANDER_PORT=8081 # --- @@ -49,7 +52,6 @@ CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP=True CELERY_BROKER_CONNECTION_RETRY=True CELERY_BROKER_CONNECTION_MAX_RETRIES=10 CELERY_BROKER_HEARTBEAT=10 -CELERY_RESULT_BACKEND=rpc:// # Late ack means the task messages will be acknowledged after the task has been executed, not right before [>TrueFalse<] @@ -73,4 +75,4 @@ CELERY_WORKER_REDIRECT_STDOUTS=False # Log level for task logs [DEBUG/>INFOFalse<] DJANGO_DEBUG: True DJANGO_ALLOWED_HOSTS: 127.0.0.1,localhost,django DJANGO_ASYNC_TIMEOUT_S: 30 + # --- + # Whether to retry failed connections to the broker on startup [>TrueTrueTrueFalse<] CELERY_TASK_ALWAYS_EAGER: False + # Worker process: + # [ + # 'solo' - single process + # >'prefork'< - multiple processes (linux only) + # ] CELERY_WORKER_POOL: prefork + # Restart worker after each task [>422False<] CELERY_TASK_IGNORE_RESULT: False + # Configure task logging [True/>False<] CELERY_WORKER_REDIRECT_STDOUTS: False + # Log level for task logs [DEBUG/>INFOFalse<] DJANGO_DEBUG: True DJANGO_ALLOWED_HOSTS: 127.0.0.1,localhost,django DJANGO_ASYNC_TIMEOUT_S: 30 + # --- + # Whether to retry failed connections to the broker on startup [>TrueTrueTrueFalse<] CELERY_TASK_ALWAYS_EAGER: False + # Worker process: + # [ + # 'solo' - single process + # >'prefork'< - multiple processes (linux only) + # ] CELERY_WORKER_POOL: prefork + # Restart worker after each task [>422False<] CELERY_TASK_IGNORE_RESULT: False + # Configure task logging [True/>False<] CELERY_WORKER_REDIRECT_STDOUTS: False + # Log level for task logs [DEBUG/>INFO= field.all_beds: + return Response( + {"error": f"There is no space left on the field '{field.name}'."}, + status=status.HTTP_400_BAD_REQUEST + ) + bed = Bed.objects.create(field=field, rented_by=rented_by) + return Response( + {"message": "Bed successfully created."}, + status=status.HTTP_201_CREATED + ) + + @staticmethod + def rent_beds(field, user, beds_count): + free_beds = Bed.objects.filter(field=field, is_rented=False).order_by('id')[:beds_count] + rented_beds = [] + if len(free_beds) < beds_count: + log.warning(f"Not enough free beds available for rent.") + return 0 + + for bed in free_beds: bed.is_rented = True - bed.rented_by = person + bed.rented_by = user bed.save() + rented_beds.append(bed) - field = bed.field - field.count_beds -= 1 - field.save() - return Response( - {"message": "Bed successfully rented."}, - status=status.HTTP_200_OK - ) - except Bed.DoesNotExist: - return Response( - {"error": "Bed with the given ID does not exist."}, - status=status.HTTP_404_NOT_FOUND - ) + field.count_free_beds -= beds_count + field.save() + log.info(f"{beds_count} beds rented successfully.") + return beds_count @staticmethod - def release_bed(bed_id: int): - try: - bed = Bed.objects.get(id=bed_id) - field = bed.field - if not bed.is_rented: - return Response( - {"error": "This bed is not currently rented."}, - status=status.HTTP_400_BAD_REQUEST - ) + def release_beds(field, beds_count): + rented_beds = Bed.objects.filter(field=field, is_rented=True)[:beds_count] + for bed in rented_beds: bed.is_rented = False bed.rented_by = None bed.save() - field.count_beds += 1 - field.save() - return Response( - {"message": "Bed successfully released."}, - status=status.HTTP_200_OK - ) - except Bed.DoesNotExist: - return Response( - {"error": "Bed with the given ID does not exist."}, - status=status.HTTP_404_NOT_FOUND - ) - + field.count_free_beds += beds_count + field.save() + log.info(f"{beds_count} beds released successfully.") @staticmethod def get_user_beds(user): + log.debug(f"Getting beds rented by user with ID={user.id}") return Bed.objects.filter(rented_by=user) @staticmethod def filter_beds(is_rented=None): if is_rented is not None: + log.debug(f"Filtering beds by is_rented={is_rented}") return Bed.objects.filter(is_rented=is_rented) + log.debug("Getting all beds") return Bed.objects.all() diff --git a/django/tamprog/garden/tests.py b/django/tamprog/garden/tests.py index cb4b60b0..7b82c800 100644 --- a/django/tamprog/garden/tests.py +++ b/django/tamprog/garden/tests.py @@ -4,6 +4,8 @@ from mixer.backend.django import mixer from celery.result import AsyncResult from unittest.mock import patch +from rest_framework import status +from orders.models import Order def test_get_sorted_fields_success(celery_settings, mocker): mocked_task = mocker.patch('garden.services.get_sorted_fields_task.delay') @@ -18,7 +20,8 @@ def test_get_sorted_fields_timeout(celery_settings, mocker): mocked_task.return_value = AsyncResult('fake-task-id') mocker.patch.object(AsyncResult, 'get', side_effect=Exception('Timeout')) with pytest.raises(Exception, match='Timeout'): - FieldService.get_sorted_fields(sort_by='price', ascending=True) + FieldService.get_sorted_fields(sort_by='count_free_beds', ascending=True) + @pytest.mark.django_db def test_filter_beds(api_client, user, beds): @@ -37,44 +40,62 @@ def test_rent_bed_already_rented(beds, person): for bed in beds: bed.is_rented = True bed.save() - result = BedService.rent_bed(bed_id=bed.id, person=person) - assert result.status_code == 400 + field = beds[0].field + result = BedService.rent_beds(field=field, user=person, beds_count=len(beds)) + assert result == 0 @pytest.mark.django_db def test_rent_bed_success(beds, person): - bed = next(b for b in beds if not b.is_rented) - initial_count = bed.field.count_beds - result = BedService.rent_bed(bed_id=bed.id, person=person) - bed.refresh_from_db() - assert result.status_code == 200 - assert bed.is_rented is True - assert bed.rented_by == person - assert bed.field.count_beds == initial_count - 1 + free_beds = [bed for bed in beds if not bed.is_rented] + assert free_beds, "Должна быть хотя бы одна свободная грядка для теста" + field = free_beds[0].field + initial_count = field.count_free_beds + rented_count = BedService.rent_beds(field=field, user=person, beds_count=1) + field.refresh_from_db() + rented_bed = Bed.objects.filter(field=field, rented_by=person).first() + assert rented_count == 1, "Должна быть успешно арендована одна грядка" + assert rented_bed is not None, "Должна быть найдена арендованная грядка" + assert rented_bed.is_rented is True + assert rented_bed.rented_by == person + assert field.count_free_beds == initial_count - 1 @pytest.mark.django_db def test_release_bed_success(beds, person): bed = beds[0] + field = bed.field + assert bed, "Грядка должна существовать" + assert field, "У грядки должно быть связано поле" bed.is_rented = True bed.rented_by = person bed.save() - initial_count = bed.field.count_beds - result = BedService.release_bed(bed_id=bed.id) + initial_free_beds = field.count_free_beds + assert bed.is_rented is True, "Грядка должна быть арендована перед освобождением" + assert bed.rented_by == person, "Грядка должна быть связана с пользователем" + BedService.release_beds(field=field, beds_count=1) bed.refresh_from_db() - assert result.status_code == 200 - assert bed.is_rented is False - assert bed.rented_by is None - assert bed.field.count_beds == initial_count + 1 + field.refresh_from_db() + assert bed.is_rented is False, "Грядка должна быть освобождена" + assert bed.rented_by is None, "У грядки не должно быть арендатора" + assert field.count_free_beds == initial_free_beds + 1, "Количество свободных грядок должно увеличиться" @pytest.mark.django_db def test_release_bed_not_rented(beds): for bed in beds: bed.is_rented = False + bed.rented_by = None bed.save() - result = BedService.release_bed(bed_id=bed.id) - assert result.status_code == 400 + result = BedService.release_beds(field=beds[0].field, beds_count=1) + assert result is None + for bed in beds: + bed.refresh_from_db() + assert bed.is_rented is False + assert bed.rented_by is None + field = beds[0].field + field.refresh_from_db() + assert field.count_free_beds == field.count_free_beds @pytest.mark.django_db def test_get_user_beds(beds, person): @@ -110,7 +131,6 @@ def test_filter_beds_not_rented(beds): for bed in not_rented_beds: assert bed.is_rented is False - @pytest.mark.django_db def test_get_sorted_fields_by_price(celery_settings, mocker,fields): mocker.patch('garden.services.get_sorted_fields_task.delay') @@ -137,5 +157,39 @@ def test_get_sorted_fields_by_beds(celery_settings, mocker): fields = FieldService.get_sorted_fields(sort_by='count_beds', ascending=True) assert [field['count_beds'] for field in fields] == [10, 11, 12, 13, 14] +@pytest.mark.django_db +def test_get_sorted_fields_timeout(api_client, superuser): + api_client.force_authenticate(user=superuser) + url = '/api/v1/field/' + response = api_client.get(url, {'sort_by': 'price', 'ascending': 'true'}) + assert response.status_code == 200 + assert 'error' not in response.data + +@pytest.mark.django_db +def test_get_user_beds_url(api_client, superuser, beds, person): + api_client.force_authenticate(user=person) + for bed in beds: + bed.rented_by = person + bed.is_rented = True + bed.save() + url = '/api/v1/bed/my_beds/' + response = api_client.get(url) + assert response.status_code == 200 + assert len(response.data) == len(beds) + for bed in response.data: + assert bed['rented_by'] == person.id + assert bed['is_rented'] is True +@pytest.mark.django_db +def test_filter_beds_is_rented_url(api_client, superuser, beds): + api_client.force_authenticate(user=superuser) + for bed in beds: + bed.is_rented = True + bed.save() + url = '/api/v1/bed/' + response = api_client.get(url, {'is_rented': 'true'}) + assert response.status_code == 200 + assert len(response.data) == len(beds) + for bed in response.data: + assert bed['is_rented'] is True \ No newline at end of file diff --git a/django/tamprog/garden/views.py b/django/tamprog/garden/views.py index 69f236f8..1d14a75e 100644 --- a/django/tamprog/garden/views.py +++ b/django/tamprog/garden/views.py @@ -2,10 +2,14 @@ from rest_framework.permissions import IsAuthenticated, AllowAny from rest_framework.decorators import action from rest_framework.response import Response +from rest_framework.exceptions import ValidationError from .permission import * from .models import Field, Bed from .serializers import FieldSerializer, BedSerializer from .services import * +from logging import getLogger + +log = getLogger(__name__) from drf_spectacular.utils import extend_schema, extend_schema_view, \ OpenApiResponse, OpenApiParameter, OpenApiExample @@ -19,8 +23,14 @@ def FieldParameters(required=False): required=required, ), OpenApiParameter( - name="count_beds", - description="Count of beds", + name="count_free_beds", + description="Count of free beds", + type=int, + required=required, + ), + OpenApiParameter( + name="all_beds", + description="Count of all beds", type=int, required=required, ), @@ -30,6 +40,12 @@ def FieldParameters(required=False): type=float, required=required, ), + OpenApiParameter( + name="url", + description="image", + type=str, + required=required, + ), ] @extend_schema(tags=['Field']) @@ -39,8 +55,12 @@ class FieldViewSet(viewsets.ModelViewSet): permission_classes = [AgronomistPermission] def perform_create(self, serializer): - count_beds = self.request.data.get('count_beds', 0) - serializer.save(count_beds=count_beds) + log.debug(f"Creating field with data: {self.request.data}") + name = serializer.validated_data['name'] + all_beds = serializer.validated_data['all_beds'] + price = serializer.validated_data['price'] + url = serializer.validated_data['url'] + FieldService.create_field(name, all_beds, price, url) @extend_schema( summary='List all fields', @@ -56,7 +76,7 @@ def perform_create(self, serializer): type=str, description='Sort by field', required=False, - enum=['id', 'name', 'count_beds', 'price'], + enum=['id', 'name', 'count_free_beds', 'all_beds', 'price'], ), OpenApiParameter( name='asc', @@ -71,6 +91,7 @@ def list(self, request, *args, **kwargs): ascending = request.query_params.get('asc', 'true').lower() == 'true' fields = FieldService.get_sorted_fields(sort_by, ascending) serializer = self.get_serializer(fields, many=True) + log.debug(f"Returning list of fields: {serializer.data}") return Response(serializer.data) @extend_schema( @@ -83,6 +104,7 @@ def list(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.debug(f"Retrieving field with ID={kwargs['pk']}") return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -95,6 +117,7 @@ def retrieve(self, request, *args, **kwargs): parameters=FieldParameters(required=True), ) def update(self, request, *args, **kwargs): + log.debug(f"Updating field with ID={kwargs['pk']} with data: {request.data}") return super().update(request, *args, **kwargs) @extend_schema( @@ -107,6 +130,7 @@ def update(self, request, *args, **kwargs): parameters=FieldParameters(), ) def partial_update(self, request, *args, **kwargs): + log.debug(f"Partially updating field with ID={kwargs['pk']} with data: {request.data}") return super().partial_update(request, *args, **kwargs) @extend_schema( @@ -118,6 +142,7 @@ def partial_update(self, request, *args, **kwargs): }, ) def destroy(self, request, *args, **kwargs): + log.debug(f"Deleting field with ID={kwargs['pk']}") return super().destroy(request, *args, **kwargs) @extend_schema( @@ -130,6 +155,7 @@ def destroy(self, request, *args, **kwargs): parameters=FieldParameters(required=True), ) def create(self, request, *args, **kwargs): + log.debug(f"Creating field with data: {request.data}") return super().create(request, *args, **kwargs) def BedParameters(required=False): @@ -169,6 +195,7 @@ class BedViewSet(viewsets.ModelViewSet): } ) def create(self, request, *args, **kwargs): + log.debug(f"Creating bed with data: {request.data}") return super().create(request, *args, **kwargs) @extend_schema( @@ -182,6 +209,7 @@ def create(self, request, *args, **kwargs): }, ) def list(self, request, *args, **kwargs): + log.debug(f"Listing all beds") return super().list(request, *args, **kwargs) @extend_schema( @@ -195,6 +223,7 @@ def list(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.debug(f"Retrieving bed with ID={kwargs['pk']}") return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -208,6 +237,7 @@ def retrieve(self, request, *args, **kwargs): parameters=BedParameters(required=True), ) def update(self, request, *args, **kwargs): + log.debug(f"Updating bed with ID={kwargs['pk']} with data: {request.data}") return super().update(request, *args, **kwargs) @extend_schema( @@ -220,6 +250,7 @@ def update(self, request, *args, **kwargs): }, ) def destroy(self, request, *args, **kwargs): + log.debug(f"Deleting bed with ID={kwargs['pk']}") return super().destroy(request, *args, **kwargs) @extend_schema( @@ -233,8 +264,16 @@ def destroy(self, request, *args, **kwargs): parameters=BedParameters(), ) def partial_update(self, request, *args, **kwargs): + log.debug(f"Partially updating bed with ID={kwargs['pk']} with data: {request.data}") return super().partial_update(request, *args, **kwargs) + def perform_create(self, serializer): + field = serializer.validated_data['field'] + rented_by = serializer.validated_data.get('rented_by', None) + response = BedService.create_bed(field, rented_by) + if isinstance(response, Response) and response.status_code != status.HTTP_201_CREATED: + raise ValidationError(response.data["error"]) + @extend_schema( summary='List all beds for current user', description='List all beds that are rented by the current user', @@ -249,74 +288,105 @@ def partial_update(self, request, *args, **kwargs): def my_beds(self, request): beds = BedService.get_user_beds(request.user) serializer = self.get_serializer(beds, many=True) + log.debug(f"Returning list of beds rented by user: {serializer.data}") return Response(serializer.data) @extend_schema( - summary='Rent bed', - description='Rent bed', + summary='Rent beds', + description='Rent a specified number of beds from a field.', responses={ status.HTTP_200_OK: OpenApiResponse( - description='Bed successfully rented.', + description='Beds successfully rented.', ), status.HTTP_400_BAD_REQUEST: OpenApiResponse( - description='Bad request: Bed is already rented.', + description='Bad request: Not enough free beds available.', ), status.HTTP_404_NOT_FOUND: OpenApiResponse( - description='Bed not found.', + description='Field not found.', ), }, parameters=BedParameters(required=True), examples=[ OpenApiExample( - name='Rent bed for user', + name='Rent beds for user', value={ - "is_rented": True, "field": 1, - "rented_by": 1 + "beds_count": 3 } ) ], ) - @action(detail=True, methods=['post']) - def rent(self, request, pk=None): - bed = self.get_object() - person = request.user - return BedService.rent_bed(bed.id, person) + @action(detail=False, methods=['post']) + def rent(self, request): + field_id = request.data.get('field') + beds_count = request.data.get('beds_count') + user = request.user + + log.debug(f"Attempting to rent {beds_count} beds for user with ID={user.id} in field with ID={field_id}") + + try: + field = Field.objects.get(id=field_id) + except Field.DoesNotExist: + return Response({'error': 'Field not found'}, status=status.HTTP_404_NOT_FOUND) + + rented_beds = BedService.rent_beds(field, user, beds_count) + + if rented_beds == 0: + return Response({'error': 'Not enough free beds available for rent.'}, status=status.HTTP_400_BAD_REQUEST) + + return Response({ + 'message': f'{beds_count} beds rented successfully.', + 'rented_beds': [{'id': bed.id, 'position': bed.position, 'is_rented': bed.is_rented} for bed in rented_beds] + }, status=status.HTTP_200_OK) @extend_schema( - summary='Release bed', - description='Release bed', + summary='Release beds', + description='Release a specified number of rented beds from a field.', responses={ status.HTTP_200_OK: OpenApiResponse( - description='Bed successfully released.', + description='Beds successfully released.', ), status.HTTP_400_BAD_REQUEST: OpenApiResponse( - description='Bad request: Bed is not rented.', + description='Bad request: Not enough rented beds.', ), status.HTTP_404_NOT_FOUND: OpenApiResponse( - description='Bed not found.', + description='Field not found.', ), }, parameters=BedParameters(required=True), examples=[ OpenApiExample( - name='Release bed for user', + name='Release beds for user', value={ - "is_rented": False, "field": 1, - "rented_by": 1 + "beds_count": 2 } ) ], ) - @action(detail=True, methods=['post']) - def release(self, request, pk=None): - bed = self.get_object() - return BedService.release_bed(bed.id) + @action(detail=False, methods=['post']) + def release(self, request): + field_id = request.data.get('field') + beds_count = request.data.get('beds_count') + + log.debug(f"Attempting to release {beds_count} beds in field with ID={field_id}") + + try: + field = Field.objects.get(id=field_id) + except Field.DoesNotExist: + return Response({'error': 'Field not found'}, status=status.HTTP_404_NOT_FOUND) + + BedService.release_beds(field, beds_count) + + return Response({ + 'message': f'{beds_count} beds released successfully.' + }, status=status.HTTP_200_OK) def get_queryset(self): is_rented = self.request.query_params.get('is_rented', None) if is_rented is not None: + log.debug(f"Filtering beds by is_rented={is_rented}") return BedService.filter_beds(is_rented=is_rented.lower() == 'true') + log.debug("Returning all beds") return Bed.objects.all() diff --git a/django/tamprog/orders/migrations/0007_alter_order_total_cost.py b/django/tamprog/orders/migrations/0007_alter_order_total_cost.py new file mode 100644 index 00000000..0be9f097 --- /dev/null +++ b/django/tamprog/orders/migrations/0007_alter_order_total_cost.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.16 on 2024-11-22 10:24 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('orders', '0006_alter_order_completed_at'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='total_cost', + field=models.FloatField(default=0.0, validators=[django.core.validators.MinValueValidator(0)]), + ), + ] diff --git a/django/tamprog/orders/migrations/0008_rename_action_order_comments.py b/django/tamprog/orders/migrations/0008_rename_action_order_comments.py new file mode 100644 index 00000000..cc09366f --- /dev/null +++ b/django/tamprog/orders/migrations/0008_rename_action_order_comments.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-22 21:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('orders', '0007_alter_order_total_cost'), + ] + + operations = [ + migrations.RenameField( + model_name='order', + old_name='action', + new_name='comments', + ), + ] diff --git a/django/tamprog/orders/migrations/0009_alter_order_comments.py b/django/tamprog/orders/migrations/0009_alter_order_comments.py new file mode 100644 index 00000000..b850d2d8 --- /dev/null +++ b/django/tamprog/orders/migrations/0009_alter_order_comments.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-26 09:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('orders', '0008_rename_action_order_comments'), + ] + + operations = [ + migrations.AlterField( + model_name='order', + name='comments', + field=models.CharField(blank=True, max_length=100, null=True), + ), + ] diff --git a/django/tamprog/orders/migrations/0010_remove_order_bed_order_beds_count_order_field.py b/django/tamprog/orders/migrations/0010_remove_order_bed_order_beds_count_order_field.py new file mode 100644 index 00000000..b6605c4b --- /dev/null +++ b/django/tamprog/orders/migrations/0010_remove_order_bed_order_beds_count_order_field.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.16 on 2024-11-27 11:07 + +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('garden', '0006_rename_count_beds_field_all_beds_and_more'), + ('orders', '0009_alter_order_comments'), + ] + + operations = [ + migrations.RemoveField( + model_name='order', + name='bed', + ), + migrations.AddField( + model_name='order', + name='beds_count', + field=models.IntegerField(default=1, validators=[django.core.validators.MinValueValidator(1)]), + ), + migrations.AddField( + model_name='order', + name='field', + field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='garden.field'), + preserve_default=False, + ), + ] diff --git a/django/tamprog/orders/migrations/0011_order_fertilize.py b/django/tamprog/orders/migrations/0011_order_fertilize.py new file mode 100644 index 00000000..26ba7cdb --- /dev/null +++ b/django/tamprog/orders/migrations/0011_order_fertilize.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-27 20:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('orders', '0010_remove_order_bed_order_beds_count_order_field'), + ] + + operations = [ + migrations.AddField( + model_name='order', + name='fertilize', + field=models.BooleanField(default=False), + ), + ] diff --git a/django/tamprog/orders/models.py b/django/tamprog/orders/models.py index 3130f903..81ed1835 100644 --- a/django/tamprog/orders/models.py +++ b/django/tamprog/orders/models.py @@ -1,14 +1,17 @@ from django.db import models from user.models import Person, Worker -from garden.models import Bed +from garden.models import Field from plants.models import Plant +from django.core.validators import MinValueValidator class Order(models.Model): user = models.ForeignKey(Person, on_delete=models.CASCADE) worker = models.ForeignKey(Worker, on_delete=models.CASCADE) - bed = models.ForeignKey(Bed, on_delete=models.CASCADE) + field = models.ForeignKey(Field, on_delete=models.CASCADE) + beds_count = models.IntegerField(default=1, validators=[MinValueValidator(1)]) plant = models.ForeignKey(Plant, on_delete=models.CASCADE) - action = models.CharField(max_length=100) + comments = models.CharField(max_length=100, blank=True, null=True) created_at = models.DateTimeField(auto_now_add=True) completed_at = models.DateTimeField(null=True, blank=True) - total_cost = models.FloatField(default=0.00) \ No newline at end of file + total_cost = models.FloatField(default=0.00, validators=[MinValueValidator(0)]) + fertilize = models.BooleanField(default=False) \ No newline at end of file diff --git a/django/tamprog/orders/serializer.py b/django/tamprog/orders/serializer.py index adc1fc6d..5e3bc61b 100644 --- a/django/tamprog/orders/serializer.py +++ b/django/tamprog/orders/serializer.py @@ -4,7 +4,7 @@ class OrderSerializer(serializers.ModelSerializer): class Meta: model = Order - fields = ['id', 'worker','user', 'bed', 'plant', 'action', 'created_at', 'completed_at', 'total_cost'] - read_only_fields = ['total_cost', 'created_at', 'user', 'worker'] + fields = ['id', 'worker', 'user', 'field', 'beds_count', 'plant', 'comments', 'created_at', 'completed_at', 'total_cost', 'fertilize'] + read_only_fields = ['total_cost', 'created_at', 'user', 'worker', 'completed_at'] diff --git a/django/tamprog/orders/services.py b/django/tamprog/orders/services.py index b391c114..f2cc80ac 100644 --- a/django/tamprog/orders/services.py +++ b/django/tamprog/orders/services.py @@ -2,57 +2,125 @@ from rest_framework.response import Response from rest_framework import status from django.utils import timezone +from datetime import timedelta +from conftest import fertilizers +from fertilizer.models import Fertilizer +from garden.models import Bed from user.models import Worker from user.services import PersonService from .models import Order +from logging import getLogger +from garden.services import BedService +from plants.services import BedPlantService +log = getLogger(__name__) class OrderService: @staticmethod - def calculate_total_cost(bed, plant, worker): - field_price = bed.field.price - plant_price = plant.price + def calculate_total_cost(field, plant, worker, beds_count): + field_price = field.price * beds_count + plant_price = plant.price * beds_count worker_price = worker.price - return field_price + plant_price + worker_price + total_cost = field_price + plant_price + worker_price + log.debug( + f"Total cost calculated: field={field_price}, plant={plant_price}, worker={worker_price}, total={total_cost}") + return total_cost @staticmethod - def create_order(user, bed, plant, action): + def create_order(user, field, plant, beds_count, comments, fertilize): available_workers = Worker.objects.all() if not available_workers.exists(): - return Response( - {'error': 'No available workers'}, - status=status.HTTP_400_BAD_REQUEST - ) + log.warning("No available workers") + return Response({'error': 'No available workers'}, status=status.HTTP_400_BAD_REQUEST) + worker = random.choice(available_workers) - total_cost = OrderService.calculate_total_cost(bed, plant, worker) - wallet_response = PersonService.update_wallet_balance(user, total_cost) - if wallet_response.status_code != status.HTTP_200_OK: - return wallet_response - - order = Order.objects.create( - user=user, - worker=worker, - bed=bed, - plant=plant, - action=action, - total_cost=total_cost - ) - return Response( - {'status': 'Order created successfully', 'order_id': order.id}, - status=status.HTTP_201_CREATED - ) + + if field.count_free_beds < beds_count: + return Response({'error': 'Not enough free beds on the field'}, status=status.HTTP_400_BAD_REQUEST) + + total_cost = OrderService.calculate_total_cost(field, plant, worker, beds_count) + if user.wallet_balance < total_cost: + return Response({'error': 'Insufficient funds'}, status=status.HTTP_400_BAD_REQUEST) + + rented_beds = [] + try: + user.wallet_balance -= total_cost + user.save() + log.debug(f"User balance updated: {user.wallet_balance}") + + rented_beds = BedService.rent_beds(field, user, beds_count) + log.debug(f"Rented beds count: {rented_beds}") + if rented_beds != beds_count: + raise ValueError("Failed to rent the required number of beds") + + fertilizer_used = fertilize + fertilizer = None + if fertilize: + fertilizer = Fertilizer.objects.filter(compound__icontains=plant.name).first() + if not fertilizer: + fertilizer_used = False + log.warning(f"No suitable fertilizer found for plant {plant.name}. Fertilization skipped.") + + plant_response = BedPlantService.plant_in_beds( + field, plant, beds_count, fertilizer if fertilizer_used else None + ) + if plant_response.status_code != 201: + raise ValueError("Failed to plant in beds") + + completion_time = timezone.now() + timedelta(days=plant.growth_time) + order = Order.objects.create( + user=user, + worker=worker, + field=field, + plant=plant, + beds_count=beds_count, + comments=comments, + total_cost=total_cost, + fertilize=fertilizer_used, + completed_at=completion_time + ) + log.debug(f"Order created successfully with ID={order.id}") + + response_message = { + 'status': 'Order created successfully', + 'order_id': order.id + } + if not fertilizer_used: + response_message['warning'] = 'Fertilization skipped as no suitable fertilizer was found.' + + return Response(response_message, status=status.HTTP_201_CREATED) + + except Exception as e: + log.error(f"Error creating order: {e}") + if rented_beds: + BedService.release_beds(field, len(rented_beds)) + log.debug(f"Released {len(rented_beds)} beds") + user.wallet_balance += total_cost + user.save() + log.debug(f"User balance restored: {user.wallet_balance}") + return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST) + @staticmethod def complete_order(order): order.completed_at = timezone.now() order.save() + log.debug(f"Order with ID={order.id} completed") return order + @staticmethod + def get_orders(user): + log.debug(f"Getting orders by user with ID={user.id}") + return Order.objects.filter(user=user) + @staticmethod def filter_orders(is_completed=None): if is_completed is not None: if is_completed: + log.debug("Filtering completed orders") return Order.objects.filter(completed_at__isnull=False) else: + log.debug("Filtering not completed orders") return Order.objects.filter(completed_at__isnull=True) + log.debug("Getting all orders") return Order.objects.all() diff --git a/django/tamprog/orders/tests.py b/django/tamprog/orders/tests.py index c7baf147..db579716 100644 --- a/django/tamprog/orders/tests.py +++ b/django/tamprog/orders/tests.py @@ -4,6 +4,7 @@ from orders.models import Order from rest_framework import status from rest_framework.response import Response +from decimal import Decimal @pytest.mark.django_db def test_filter_orders(api_client, user, orders): @@ -24,40 +25,118 @@ def test_filter_orders(api_client, user, orders): @pytest.mark.django_db def test_calculate_total_cost(beds, plants, workers): for bed, plant, worker in zip(beds, plants, workers): - total_cost = OrderService.calculate_total_cost(bed, plant, worker) - assert total_cost == bed.field.price + plant.price + worker.price - + beds_count = 1 + total_cost = OrderService.calculate_total_cost(bed.field, plant, worker, beds_count) + assert total_cost == (bed.field.price * beds_count) + (plant.price * beds_count) + worker.price @pytest.mark.django_db def test_create_order_success(user, workers, beds, plants, mocker): + user.wallet_balance = 100000.00 + user.save() mocker.patch( "user.services.PersonService.update_wallet_balance", return_value=Response(status=status.HTTP_200_OK) ) + mocker.patch( + "garden.services.BedService.rent_beds", + return_value=2 + ) + mocker.patch( + "plants.services.BedPlantService.plant_in_beds", + return_value=Response(status=status.HTTP_201_CREATED) + ) + field = beds[0].field + plant = plants[0] + worker = workers[0] + beds_count = 2 + total_cost = field.price * beds_count + plant.price * beds_count + worker.price action = "planting" - for worker, bed, plant in zip(workers, beds, plants): - response = OrderService.create_order(user, bed, plant, action) - assert response.status_code == status.HTTP_201_CREATED - order_id = response.data['order_id'] - order = Order.objects.get(id=order_id) - assert order.user == user - assert order.worker is not None - assert order.bed == bed - assert order.plant == plant - assert order.total_cost == bed.field.price + plant.price + order.worker.price + response = OrderService.create_order(user, field, plant, beds_count, action, fertilize=False) + assert response.status_code == status.HTTP_201_CREATED, f"Unexpected status code: {response.status_code}" + order_id = response.data['order_id'] + order = Order.objects.get(id=order_id) + assert order.user == user + assert order.worker is not None + assert order.field == field + assert order.plant == plant + assert order.total_cost == total_cost @pytest.mark.django_db -def test_create_order_insufficient_funds(user, workers, beds, plants, mocker): +def test_create_order_via_url(api_client, user, workers, beds, plants, mocker): mocker.patch( "user.services.PersonService.update_wallet_balance", - return_value=Response(status=status.HTTP_400_BAD_REQUEST, data={"error": "Insufficient funds"}) + return_value=Response(status=status.HTTP_200_OK) ) - action = "planting" - for worker, bed, plant in zip(workers, beds, plants): - response = OrderService.create_order(user, bed, plant, action) - assert response.status_code == status.HTTP_400_BAD_REQUEST - assert response.data['error'] == "Insufficient funds" + mocker.patch( + "garden.services.BedService.rent_beds", + return_value=2 + ) + mocker.patch( + "plants.services.BedPlantService.plant_in_beds", + return_value=Response(status=status.HTTP_201_CREATED) + ) + + + assert beds[0].field is not None, "Поле для грядки должно быть указано" + assert plants[0] is not None, "Растение должно быть указано" + assert workers[0] is not None, "Работник должен быть указан" + + initial_balance = 150000.0 + user.wallet_balance = initial_balance + user.save() + + api_client.force_authenticate(user=user) + + url = '/api/v1/order/' + data = { + "field": beds[0].field.id, + "plant": plants[0].id, + "worker": workers[0].id, + "beds_count": 2, + "comments": "planting", + "fertilize": True + } + + response = api_client.post(url, data) + + print(response.data) + assert response.status_code == status.HTTP_201_CREATED, f"Unexpected status code: {response.status_code}, Response: {response.data}" + + order = Order.objects.get( + field=beds[0].field, + plant=plants[0], + worker=workers[0], + comments="planting" + ) + + assert order.user == user + assert order.worker == workers[0] + assert order.field == beds[0].field + assert order.plant == plants[0] + + total_cost = (beds[0].field.price * data["beds_count"]) + (plants[0].price * data["beds_count"]) + workers[0].price + assert order.total_cost == total_cost + + user.refresh_from_db() + expected_balance = initial_balance - total_cost + assert user.wallet_balance == expected_balance + + +@pytest.mark.django_db +def test_create_order_insufficient_funds(user, fields, plants, workers, mocker): + field = fields[0] + plant = plants[0] + + beds_count = 3 + comments = "Тестовый заказ с недостаточными средствами" + fertilize = True + worker = workers[0] + user.wallet_balance = 50 + user.save() + response = OrderService.create_order(user, field, plant, beds_count, comments, fertilize) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data['error'] == "Insufficient funds" @pytest.mark.django_db @@ -90,9 +169,39 @@ def test_filter_orders_not_completed(orders): @pytest.mark.django_db def test_filter_orders_all(orders): all_orders = OrderService.filter_orders() - - # Проверяем, что все заказы из базы данных получены assert len(all_orders) == len(orders) for order in all_orders: assert order in orders +@pytest.mark.django_db +def test_filter_orders_completed_url(api_client, superuser, orders): + api_client.force_authenticate(user=superuser) + url = '/api/v1/order/' + response = api_client.get(url, {'is_completed': 'true'}) + assert response.status_code == 200 + response_data = response.data + assert all(order['completed_at'] is not None for order in response_data) + assert len(response_data) == sum(1 for order in orders if order.completed_at is not None) + +@pytest.mark.django_db +def test_filter_orders_not_completed_url(api_client, superuser, orders): + api_client.force_authenticate(user=superuser) + url = '/api/v1/order/' + response = api_client.get(url, {'is_completed': 'false'}) + assert response.status_code == 200 + response_data = response.data + assert all(order['completed_at'] is None for order in response_data) + assert len(response_data) == sum(1 for order in orders if order.completed_at is None) + +@pytest.mark.django_db +def test_filter_orders_all_url(api_client, superuser, orders): + api_client.force_authenticate(user=superuser) + url = '/api/v1/order/' + response = api_client.get(url) + assert response.status_code == 200 + response_data = response.data + assert len(response_data) == len(orders) + for order in response_data: + assert order['id'] in [o.id for o in orders] + + diff --git a/django/tamprog/orders/views.py b/django/tamprog/orders/views.py index 920ffe6c..3a7984b9 100644 --- a/django/tamprog/orders/views.py +++ b/django/tamprog/orders/views.py @@ -1,9 +1,14 @@ from rest_framework import viewsets, status from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response +from rest_framework.exceptions import ValidationError +from rest_framework.decorators import action from .serializer import * from .models import Order from .services import OrderService +from logging import getLogger + +log = getLogger(__name__) from drf_spectacular.utils import extend_schema, extend_schema_view, \ OpenApiResponse, OpenApiParameter, OpenApiExample @@ -23,8 +28,8 @@ def OrderParameters(required=False): required=required, ), OpenApiParameter( - name="action", - description="Action to perform", + name="comments", + description="Comment to perform", type=str, required=required, ), @@ -57,6 +62,7 @@ class OrderViewSet(viewsets.ModelViewSet): parameters=OrderParameters(required=True), ) def create(self, request, *args, **kwargs): + log.debug(f"Creating order for user with ID={request.user.id}") return super().create(request, *args, **kwargs) @extend_schema( @@ -70,6 +76,7 @@ def create(self, request, *args, **kwargs): }, ) def list(self, request, *args, **kwargs): + log.debug(f"Getting all orders for user with ID={request.user.id}") return super().list(request, *args, **kwargs) @extend_schema( @@ -83,6 +90,7 @@ def list(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.debug(f"Getting order with ID={kwargs['pk']} for user with ID={request.user.id}") return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -96,6 +104,7 @@ def retrieve(self, request, *args, **kwargs): parameters=OrderParameters(required=True), ) def update(self, request, *args, **kwargs): + log.debug(f"Updating order with ID={kwargs['pk']} for user with ID={request.user.id}") return super().update(request, *args, **kwargs) @extend_schema( @@ -121,7 +130,7 @@ def update(self, request, *args, **kwargs): value={ "bed": 1, "plant": 1, - "action": "water", + "comments": "water", "completed_at": "2022-01-01T00:00:00Z" }, request_only=True, @@ -129,6 +138,7 @@ def update(self, request, *args, **kwargs): ] ) def partial_update(self, request, *args, **kwargs): + log.debug(f"Partially updating order with ID={kwargs['pk']} for user with ID={request.user.id}") return super().partial_update(request, *args, **kwargs) @extend_schema( @@ -141,22 +151,53 @@ def partial_update(self, request, *args, **kwargs): }, ) def destroy(self, request, *args, **kwargs): + log.debug(f"Deleting order with ID={kwargs['pk']} for user with ID={request.user.id}") return super().destroy(request, *args, **kwargs) def perform_create(self, serializer): user = self.request.user - bed = serializer.validated_data['bed'] + field = serializer.validated_data['field'] plant = serializer.validated_data['plant'] - action = serializer.validated_data['action'] - return OrderService.create_order(user, bed, plant, action) + beds_count = serializer.validated_data['beds_count'] + comments = serializer.validated_data['comments'] + fertilize = serializer.validated_data.get('fertilize', False) + + log.debug(f"Creating order for user with ID={user.id}") + response = OrderService.create_order(user, field, plant, beds_count, comments, fertilize) + + if isinstance(response, Response): + if response.status_code == status.HTTP_201_CREATED: + return response + else: + raise ValidationError(response.data.get("error", "Unknown error")) def perform_update(self, serializer): order = serializer.save() if order.completed_at: + log.debug(f"Completing order with ID={order.id}") OrderService.complete_order(order) + @extend_schema( + summary='List all orders for current user', + description='List all orders for current user', + responses={ + status.HTTP_200_OK: OpenApiResponse( + description='Successful response with list of orders', + response=OrderSerializer(many=True), + ) + }, + ) + @action(detail=False, methods=['get']) + def my_orders(self, request): + orders = OrderService.get_orders(request.user) + serializer = self.get_serializer(orders, many=True) + log.debug(f"Returning list of orders by user: {serializer.data}") + return Response(serializer.data) + def get_queryset(self): is_completed = self.request.query_params.get('is_completed', None) if is_completed is not None: + log.debug(f"Filtering orders by is_completed={is_completed}") return OrderService.filter_orders(is_completed=is_completed.lower() == 'true') + log.debug("Getting all orders") return Order.objects.all() diff --git a/django/tamprog/plants/apps.py b/django/tamprog/plants/apps.py index 90a2903d..c1c2ad6d 100644 --- a/django/tamprog/plants/apps.py +++ b/django/tamprog/plants/apps.py @@ -4,3 +4,6 @@ class PlantsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'plants' + + def ready(self): + import plants.signals \ No newline at end of file diff --git a/django/tamprog/plants/migrations/0008_bedplant_is_harvested.py b/django/tamprog/plants/migrations/0008_bedplant_is_harvested.py new file mode 100644 index 00000000..b2538b68 --- /dev/null +++ b/django/tamprog/plants/migrations/0008_bedplant_is_harvested.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-21 11:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plants', '0007_alter_plant_price'), + ] + + operations = [ + migrations.AddField( + model_name='bedplant', + name='is_harvested', + field=models.BooleanField(default=False), + ), + ] diff --git a/django/tamprog/plants/migrations/0009_alter_plant_price.py b/django/tamprog/plants/migrations/0009_alter_plant_price.py new file mode 100644 index 00000000..2f4e3fbb --- /dev/null +++ b/django/tamprog/plants/migrations/0009_alter_plant_price.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.16 on 2024-11-22 10:24 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plants', '0008_bedplant_is_harvested'), + ] + + operations = [ + migrations.AlterField( + model_name='plant', + name='price', + field=models.FloatField(default=0.0, validators=[django.core.validators.MinValueValidator(0)]), + ), + ] diff --git a/django/tamprog/plants/migrations/0010_bedplant_growth_percentage.py b/django/tamprog/plants/migrations/0010_bedplant_growth_percentage.py new file mode 100644 index 00000000..44661c71 --- /dev/null +++ b/django/tamprog/plants/migrations/0010_bedplant_growth_percentage.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2024-11-28 07:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plants', '0009_alter_plant_price'), + ] + + operations = [ + migrations.AddField( + model_name='bedplant', + name='growth_percentage', + field=models.IntegerField(default=0), + ), + ] diff --git a/django/tamprog/plants/migrations/0011_plant_url.py b/django/tamprog/plants/migrations/0011_plant_url.py new file mode 100644 index 00000000..33e3efc9 --- /dev/null +++ b/django/tamprog/plants/migrations/0011_plant_url.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.16 on 2024-11-28 15:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plants', '0010_bedplant_growth_percentage'), + ] + + operations = [ + migrations.AddField( + model_name='plant', + name='url', + field=models.TextField(default=0), + preserve_default=False, + ), + ] diff --git a/django/tamprog/plants/migrations/0012_bedplant_remaining_growth_time_and_more.py b/django/tamprog/plants/migrations/0012_bedplant_remaining_growth_time_and_more.py new file mode 100644 index 00000000..ba6b8480 --- /dev/null +++ b/django/tamprog/plants/migrations/0012_bedplant_remaining_growth_time_and_more.py @@ -0,0 +1,29 @@ +# Generated by Django 4.2.16 on 2024-11-28 16:01 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('plants', '0011_plant_url'), + ] + + operations = [ + migrations.AddField( + model_name='bedplant', + name='remaining_growth_time', + field=models.IntegerField(default=1, validators=[django.core.validators.MinValueValidator(0)]), + ), + migrations.AlterField( + model_name='bedplant', + name='growth_time', + field=models.IntegerField(default=1, validators=[django.core.validators.MinValueValidator(0)]), + ), + migrations.AlterField( + model_name='plant', + name='growth_time', + field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0)]), + ), + ] diff --git a/django/tamprog/plants/migrations/0013_remove_bedplant_remaining_growth_time.py b/django/tamprog/plants/migrations/0013_remove_bedplant_remaining_growth_time.py new file mode 100644 index 00000000..74602402 --- /dev/null +++ b/django/tamprog/plants/migrations/0013_remove_bedplant_remaining_growth_time.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.16 on 2024-11-28 16:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('plants', '0012_bedplant_remaining_growth_time_and_more'), + ] + + operations = [ + migrations.RemoveField( + model_name='bedplant', + name='remaining_growth_time', + ), + ] diff --git a/django/tamprog/plants/models.py b/django/tamprog/plants/models.py index c0130461..1e3273dc 100644 --- a/django/tamprog/plants/models.py +++ b/django/tamprog/plants/models.py @@ -1,15 +1,36 @@ from django.db import models from garden.models import Bed +from django.utils import timezone +from django.core.validators import MinValueValidator class Plant(models.Model): name = models.CharField(max_length=100) - growth_time = models.IntegerField(default=0) - price = models.FloatField(default=0.00) + growth_time = models.IntegerField(default=0, validators=[MinValueValidator(0)]) + price = models.FloatField(default=0.00, validators=[MinValueValidator(0)]) description = models.TextField() + url = models.TextField() class BedPlant(models.Model): bed = models.ForeignKey(Bed, on_delete=models.CASCADE) plant = models.ForeignKey(Plant, on_delete=models.CASCADE) planted_at = models.DateTimeField(auto_now_add=True) fertilizer_applied = models.BooleanField(default=False) - growth_time = models.IntegerField(default=1) \ No newline at end of file + growth_time = models.IntegerField(default=1, validators=[MinValueValidator(0)]) + is_harvested = models.BooleanField(default=False) + growth_percentage = models.IntegerField(default=0) + + @property + def remaining_growth_time(self): + elapsed_time = (timezone.now() - self.planted_at).days + remaining_time = self.growth_time - elapsed_time + return max(0, remaining_time) + + @property + def is_grown(self): + return self.remaining_growth_time == 0 + + @property + def growth_percentage_calculated(self): + elapsed_time = (timezone.now() - self.planted_at).days + percentage = (elapsed_time / self.growth_time) * 100 + return min(max(percentage, 0), 100) \ No newline at end of file diff --git a/django/tamprog/plants/permissions.py b/django/tamprog/plants/permissions.py index 1f6ac65a..a506677d 100644 --- a/django/tamprog/plants/permissions.py +++ b/django/tamprog/plants/permissions.py @@ -1,28 +1,41 @@ from rest_framework.permissions import BasePermission import re +from logging import getLogger + +log = getLogger(__name__) class AgronomistPermission(BasePermission): def has_permission(self, request, view): if request.user and request.user.is_authenticated: username = request.user.username if re.match(r'^agronom\d+$', username): + log.debug(f"User {username} is an agronomist") return True if request.user.is_superuser: + log.debug(f"User {username} is a superuser") return True + log.debug(f"User {username} is not an agronomist") return request.method in ['GET', 'HEAD', 'OPTIONS'] + log.debug("User is not authenticated") return False class AgronomistOrRenterPermission(BasePermission): def has_permission(self, request, view): if not request.user or not request.user.is_authenticated: + log.debug("User is not authenticated") return False if re.match(r'^agronom\d+$', request.user.username): + log.debug(f"User {request.user.username} is an agronomist") return True if request.user.is_superuser: + log.debug(f"User {request.user.username} is a superuser") return True + log.debug(f"User {request.user.username} is not an agronomist") return request.method in ['GET', 'POST'] def has_object_permission(self, request, view, obj): if re.match(r'^agronom\d+$', request.user.username): + log.debug(f"User {request.user.username} is an agronomist") return True + log.debug(f"User {request.user.username} is not an agronomist") return obj.bed.rented_by == request.user diff --git a/django/tamprog/plants/serializers.py b/django/tamprog/plants/serializers.py index b99da4ea..30cd7df1 100644 --- a/django/tamprog/plants/serializers.py +++ b/django/tamprog/plants/serializers.py @@ -9,4 +9,5 @@ class Meta: class BedPlantSerializer(serializers.ModelSerializer): class Meta: model = BedPlant - fields = '__all__' + fields = ['id', 'bed', 'plant', 'planted_at', 'fertilizer_applied', 'growth_time', 'growth_percentage', 'remaining_growth_time', 'is_harvested'] + read_only_fields = ['growth_time', 'is_harvested', 'planted_at', 'fertilizer_applied', 'growth_percentage', 'remaining_growth_time', 'is_grown'] diff --git a/django/tamprog/plants/services.py b/django/tamprog/plants/services.py index 8b3504ce..823f9700 100644 --- a/django/tamprog/plants/services.py +++ b/django/tamprog/plants/services.py @@ -1,69 +1,172 @@ +from garden.models import Bed +from orders.models import Order +from django.utils.timezone import now +from django.db import transaction +from datetime import timedelta +from user.services import PersonService from .models import BedPlant -from fertilizer.models import BedPlantFertilizer +from fertilizer.models import BedPlantFertilizer, Fertilizer from .queries import GetPlantsSortedByPrice from fuzzywuzzy import fuzz from rest_framework.response import Response from rest_framework import status from .models import Plant +from logging import getLogger + +log = getLogger(__name__) class PlantService: @staticmethod def get_sorted_plants(ascending: bool = True): query = GetPlantsSortedByPrice(ascending) + log.debug(f"Getting plants sorted by price in {'ascending' if ascending else 'descending'} order") return query.execute() - + @staticmethod def fuzzy_search(query, threshold=70): results = [] plants = Plant.objects.all() + query_lower = query.lower() + + exact_matches = [] + sequence_matches = [] + partial_matches = [] + for plant in plants: - similarity = fuzz.ratio(query.lower(), plant.name.lower()) - if similarity >= threshold: - results.append(plant) - return results + name_lower = plant.name.lower() + + if name_lower == query_lower: + exact_matches.append((100, plant)) + continue + + if query_lower in name_lower: + sequence_matches.append((len(query_lower), plant)) + continue + + if exact_matches or sequence_matches: + exact_matches.sort(key=lambda x: (-x[0], x[1].name)) + sequence_matches.sort(key=lambda x: (-x[0], x[1].name)) + + sorted_results = ( + [plant for _, plant in exact_matches] + + [plant for _, plant in sequence_matches] + ) + else: + for plant in plants: + name_lower = plant.name.lower() + similarity = fuzz.partial_ratio(query_lower, name_lower) + if similarity >= threshold: + partial_matches.append((similarity, plant)) + + partial_matches.sort(key=lambda x: (-x[0], x[1].name)) + + sorted_results = [plant for _, plant in partial_matches] + + unique_results = [] + added_ids = set() + for plant in sorted_results: + if plant.id not in added_ids: + unique_results.append(plant) + added_ids.add(plant.id) + + log.debug(f"Found {len(unique_results)} plants for query: {query}") + return unique_results @staticmethod def get_suggestions(query): + log.debug(f"Getting suggestions for query: {query}") return Plant.objects.filter(name__istartswith=query).values_list('name', flat=True).order_by('name')[:10] class BedPlantService: + @staticmethod + def plant_in_beds(field, plant, beds_count, fertilizer=None): + rented_beds = Bed.objects.filter(field=field, is_rented=True).order_by('id')[:beds_count] + responses = [] + with transaction.atomic(): + for bed in rented_beds: + bed_plant = BedPlant.objects.create(bed=bed, plant=plant, growth_time=plant.growth_time) + log.debug(f"Plant {plant.name} planted in bed with ID={bed.id}") + if fertilizer: + if bed.rented_by: + BedPlantService.fertilize_plant(bed_plant, fertilizer, bed.rented_by) + new_growth_time = max(0, bed_plant.growth_time - fertilizer.boost) + new_completion_time = bed_plant.planted_at + timedelta(days=new_growth_time) + + try: + order = Order.objects.filter(user=bed.rented_by).latest('created_at') + order.completed_at = new_completion_time + order.save(update_fields=["completed_at"]) + except Order.DoesNotExist: + log.warning(f"No order found for user {bed.rented_by.id}") + else: + log.warning(f"Bed with ID={bed.id} has no user associated with it, skipping fertilization.") + + responses.append({"bed_id": bed.id, "status": "success"}) + + log.debug(f"Plant {plant.name} planted in {beds_count} beds.") + return Response( + {"message": "Plants successfully planted.", "details": responses}, + status=status.HTTP_201_CREATED + ) @staticmethod - def plant_in_bed(bed, plant): - growth_time = plant.growth_time - bed_plant = BedPlant.objects.create(bed=bed, plant=plant, growth_time=growth_time) - return bed_plant + def check_plant(bed_plant): + if bed_plant.is_grown: + return True + return False + @staticmethod def harvest_plant(bed_plant): - if not bed_plant: + if not bed_plant.is_grown: + log.warning("Plant not found") return Response( - {'error': 'Plant not found'}, + {'error': 'Plant is not fully grown yet'}, status=status.HTTP_400_BAD_REQUEST ) - - bed_plant.delete() + #bed_plant.is_harvested = True + #bed_plant.save(update_fields=['is_harvested']) + log.info("Plant harvested") return Response( - {'status': 'plant dug up'}, + {'status': 'Plant harvested'}, status=status.HTTP_200_OK ) - @staticmethod - def fertilize_plant(bed_plant, fertilizer): + def fertilize_plant(bed_plant, fertilizer, user): if not fertilizer: + log.warning("No suitable fertilizer found") return Response( {'error': 'No suitable fertilizer found'}, status=status.HTTP_400_BAD_REQUEST ) + + if bed_plant.fertilizer_applied: + return Response( + {'error': 'Fertilizer can only be applied once to a plant.'}, + status=status.HTTP_400_BAD_REQUEST + ) + + required_min_growth_time = fertilizer.boost + 5 + if bed_plant.growth_time <= required_min_growth_time: + return Response( + {'error': "The plant's growth time must be at least 5 days longer than the fertilizer's boost time." }, + status=status.HTTP_400_BAD_REQUEST + ) + + balance_response = PersonService.update_wallet_balance(user, fertilizer.price) + if balance_response.status_code != status.HTTP_200_OK: + return balance_response + new_growth_time = bed_plant.growth_time - fertilizer.boost bed_plant.growth_time = new_growth_time BedPlantFertilizer.objects.create(bed_plant=bed_plant, fertilizer=fertilizer) bed_plant.fertilizer_applied = True bed_plant.save(update_fields=["fertilizer_applied", "growth_time"]) bed_plant.save() + log.info("Plant fertilized") return Response( {'status': 'plant fertilized'}, status=status.HTTP_200_OK @@ -72,19 +175,23 @@ def fertilize_plant(bed_plant, fertilizer): @staticmethod def water_plant(bed_plant): + log.error("Watering plants is not implemented yet") pass @staticmethod def dig_up_plant(bed_plant): - if not bed_plant: + if not bed_plant.is_harvested: + log.warning("Plant not found") return Response( - {'error': 'Plant not found'}, + {'error': 'Plant must be harvested before digging up'}, status=status.HTTP_400_BAD_REQUEST ) - - bed_plant.delete() + bed_plant.is_harvested = True + bed_plant.save(update_fields=['is_harvested']) + #bed_plant.delete() + log.info("Plant dug up") return Response( - {'status': 'plant dug up'}, + {'status': 'Bed is now empty'}, status=status.HTTP_200_OK ) @@ -92,5 +199,7 @@ def dig_up_plant(bed_plant): @staticmethod def filter_bed_plants(fertilizer_applied=None): if fertilizer_applied is not None: + log.debug(f"Filtering bed plants by fertilizer_applied={fertilizer_applied}") return BedPlant.objects.filter(fertilizer_applied=fertilizer_applied) - return BedPlant.objects.all() + log.debug("Getting all bed plants") + return BedPlant.objects.all() \ No newline at end of file diff --git a/django/tamprog/plants/signals.py b/django/tamprog/plants/signals.py new file mode 100644 index 00000000..1c91a64b --- /dev/null +++ b/django/tamprog/plants/signals.py @@ -0,0 +1,24 @@ +from django.db.models.signals import post_save +from django.dispatch import receiver +from django.utils import timezone +from garden.services import BedService +from .models import BedPlant +from datetime import timedelta + +@receiver(post_save, sender=BedPlant) +def check_growth_and_harvest_time(sender, instance, created, **kwargs): + if not created: + growth_end_date = instance.planted_at + timedelta(days=instance.growth_time) + if growth_end_date <= timezone.now() and not instance.is_grown: + instance.is_grown = True + instance.save() + print(f"Растение на грядке {instance.bed.id} завершило рост.") + +@receiver(post_save, sender=BedPlant) +def update_plant_growth(sender, instance, created, **kwargs): + if instance.is_grown and not instance.is_harvested: + instance.is_harvested = True + instance.growth_percentage = 100 + instance.save() + BedService.release_beds(instance.bed.field, 1) + print(f"Растение на грядке {instance.bed.id} собрано и грядка освобождена.") \ No newline at end of file diff --git a/django/tamprog/plants/tests.py b/django/tamprog/plants/tests.py index bc5e7dfa..487d9935 100644 --- a/django/tamprog/plants/tests.py +++ b/django/tamprog/plants/tests.py @@ -4,6 +4,7 @@ from plants.models import BedPlant from django.urls import reverse from fuzzywuzzy import fuzz +from django.utils import timezone @pytest.mark.django_db def test_sort_bed_plants(api_client, user, plants): @@ -16,63 +17,11 @@ def test_sort_bed_plants(api_client, user, plants): sorted_plant_prices = [bp.price for bp in sorted_plants] assert response_plant_prices == sorted_plant_prices - -@pytest.mark.django_db -def test_filter_bed_plants(api_client, user, bed_plants): - api_client.force_authenticate(user=user) - - url = '/api/v1/bedplant/?fertilizer_applied=true' - response = api_client.get(url) - assert response.status_code == 200 - assert all(bp['fertilizer_applied'] for bp in response.data) - - url = '/api/v1/bedplant/?fertilizer_applied=false' - response = api_client.get(url) - assert response.status_code == 200 - assert all(not bp['fertilizer_applied'] for bp in response.data) - - -@pytest.mark.django_db -def test_plant_in_bed(beds, plants): - for bed, plant in zip(beds, plants): # Используем zip для объединения элементов - bed_plant = BedPlantService.plant_in_bed(bed, plant) - assert bed_plant.bed == bed - assert bed_plant.plant == plant - assert bed_plant.growth_time == plant.growth_time - - - - @pytest.mark.django_db -def test_harvest_plant(bed_plants): +def test_filter_bed_plants(bed_plants, fertilizers, api_client, user): for bed_plant in bed_plants: - BedPlantService.harvest_plant(bed_plant) - assert not BedPlant.objects.filter(id=bed_plant.id).exists() + BedPlantService.fertilize_plant(bed_plant, fertilizers[0], user) - - -@pytest.mark.django_db -def test_fertilize_plant_multiple(bed_plants, fertilizers): - for bed_plant in bed_plants: - initial_growth_time = bed_plant.growth_time - # Применяем удобрение - BedPlantService.fertilize_plant(bed_plant, fertilizers[0]) - bed_plant.refresh_from_db() - - # Проверяем правильность обновления данных - assert bed_plant.growth_time == initial_growth_time - fertilizers[0].boost - assert bed_plant.fertilizer_applied is True - - # Проверка на наличие записи в модели BedPlantFertilizer - assert BedPlantFertilizer.objects.filter(bed_plant=bed_plant, fertilizer=fertilizers[0]).exists() - -@pytest.mark.django_db -def test_filter_bed_plants(bed_plants, fertilizers): - # Удобрим все растения - for bed_plant in bed_plants: - BedPlantService.fertilize_plant(bed_plant, fertilizers[0]) - - # Проверка на фильтрацию удобренных растений fertilized_plants = BedPlantService.filter_bed_plants(fertilizer_applied=True) non_fertilized_plants = BedPlantService.filter_bed_plants(fertilizer_applied=False) @@ -84,6 +33,32 @@ def test_filter_bed_plants(bed_plants, fertilizers): assert bed_plant not in fertilized_plants assert bed_plant in non_fertilized_plants +@pytest.mark.django_db +def test_filter_bed_plants_via_url(api_client, bed_plants, fertilizers, user): + api_client.force_authenticate(user=user) + for bed_plant in bed_plants: + BedPlantService.fertilize_plant(bed_plant, fertilizers[0], user) + url = '/api/v1/bedplant/' + response = api_client.get(url, {'fertilizer_applied': 'true'}) + assert response.status_code == 200, f"Unexpected status code: {response.status_code}" + fertilized_data = response.json() + for bed_plant in bed_plants: + if bed_plant.fertilizer_applied: + assert any(item['id'] == bed_plant.id for item in fertilized_data) + else: + assert all(item['id'] != bed_plant.id for item in fertilized_data) + response = api_client.get(url, {'fertilizer_applied': 'false'}) + assert response.status_code == 200, f"Unexpected status code: {response.status_code}" + non_fertilized_data = response.json() + for bed_plant in bed_plants: + if not bed_plant.fertilizer_applied: + assert any(item['id'] == bed_plant.id for item in non_fertilized_data) + else: + assert all(item['id'] != bed_plant.id for item in non_fertilized_data) + + +from fuzzywuzzy import fuzz + @pytest.mark.django_db def test_fuzzy_search(api_client, plants, user): @@ -91,14 +66,21 @@ def test_fuzzy_search(api_client, plants, user): url = '/api/v1/plant/search/' plant_name = plants[0].name[:3] response = api_client.get(url, {'q': plant_name}) + assert response.status_code == 200 expected_matches = [ plant.name for plant in plants - if fuzz.ratio(plant_name.lower(), plant.name.lower()) >= 70 + if fuzz.partial_ratio(plant_name.lower(), plant.name.lower()) >= 75 ] response_names = [plant['name'] for plant in response.data] - assert len(response_names) == len(expected_matches) - assert all(name in expected_matches for name in response_names) + print(f"Expected matches: {expected_matches}") + print(f"Response names: {response_names}") + assert all(name in response_names for name in expected_matches), \ + f"Not all expected plants were found in the response. Missing: {set(expected_matches) - set(response_names)}" + assert all(name in expected_matches for name in response_names), \ + f"Unexpected plants found in the response: {set(response_names) - set(expected_matches)}" + assert len(response_names) == len(expected_matches), \ + f"Mismatch in count: expected {len(expected_matches)}, got {len(response_names)}" @pytest.mark.django_db @@ -112,3 +94,60 @@ def test_get_suggestions(api_client, plants, user): assert all(suggestion_query in suggestion for suggestion in response.data) +@pytest.mark.django_db +def test_growth_time_adjustment_after_fertilizer(api_client, bed_plants, fertilizers, user): + api_client.force_authenticate(user=user) + for bed_plant in bed_plants: + if bed_plant.fertilizer_applied: + continue + required_min_growth_time = fertilizers[0].boost + 5 + if bed_plant.growth_time <= required_min_growth_time: + bed_plant.growth_time = required_min_growth_time + 1 + bed_plant.save() + initial_growth_time = bed_plant.growth_time + response = BedPlantService.fertilize_plant(bed_plant, fertilizers[0], user) + assert response.status_code == 200 + bed_plant.refresh_from_db() + if bed_plant.fertilizer_applied: + assert bed_plant.growth_time < initial_growth_time + else: + assert bed_plant.growth_time == initial_growth_time + + +@pytest.mark.django_db +def test_growth_time_adjustment_after_fertilizer_api(api_client, bed_plants, fertilizers, superuser): + api_client.force_authenticate(user=superuser) + for bed_plant in bed_plants: + if bed_plant.fertilizer_applied: + continue + required_min_growth_time = fertilizers[0].boost + 5 + if bed_plant.growth_time <= required_min_growth_time: + bed_plant.growth_time = required_min_growth_time + 1 + bed_plant.save() + initial_growth_time = bed_plant.growth_time + matching_fertilizers = [fertilizer for fertilizer in fertilizers if bed_plant.plant.name in fertilizer.compound] + if not matching_fertilizers: + continue + fertilizer = matching_fertilizers[0] + url = f'/api/v1/bedplant/{bed_plant.id}/fertilize/' + payload = {'fertilizer_id': fertilizer.id} + assert fertilizer is not None, "Удобрение с указанным ID не найдено" + assert bed_plant.plant.name in fertilizer.compound, "Удобрение не соответствует растению" + response = api_client.post(url, payload, format='json') + assert response.status_code == 200 + bed_plant.refresh_from_db() + if bed_plant.fertilizer_applied: + assert bed_plant.growth_time < initial_growth_time + else: + assert bed_plant.growth_time == initial_growth_time + + +@pytest.mark.django_db +def test_plant_without_fertilizer_growth_time(api_client, bed_plants, user): + api_client.force_authenticate(user=user) + for bed_plant in bed_plants: + if not bed_plant.fertilizer_applied: + initial_growth_time = bed_plant.growth_time + bed_plant.refresh_from_db() + assert bed_plant.growth_time == initial_growth_time + diff --git a/django/tamprog/plants/views.py b/django/tamprog/plants/views.py index 7b17cf48..43df0a9c 100644 --- a/django/tamprog/plants/views.py +++ b/django/tamprog/plants/views.py @@ -3,10 +3,14 @@ from rest_framework.decorators import action from rest_framework.response import Response from .permissions import * +from rest_framework.exceptions import ValidationError from .models import Plant, BedPlant from .serializers import PlantSerializer, BedPlantSerializer from .services import * from fertilizer.models import Fertilizer +from logging import getLogger + +log = getLogger(__name__) from drf_spectacular.utils import extend_schema, extend_schema_view, \ OpenApiResponse, OpenApiParameter, OpenApiExample @@ -37,6 +41,12 @@ def PlantParameters(required=False): description='Plant description', required=required, ), + OpenApiParameter( + name='url', + type=str, + description='image', + required=required, + ), ] @extend_schema(tags=['Plant']) @@ -58,25 +68,80 @@ def list(self, request, *args, **kwargs): ascending = request.query_params.get('asc', 'true').lower() == 'true' plants = PlantService.get_sorted_plants(ascending) serializer = self.get_serializer(plants, many=True) + log.debug('Listing all plants') return Response(serializer.data) - - @action(detail=False, methods=['get']) + + @extend_schema( + summary='Search for plants by query', + description='Search for plants using a query string. The search is case-insensitive and can match any part of the plant name or description.', + responses={ + status.HTTP_200_OK: OpenApiResponse( + description='List of plants matching the search query', + response=PlantSerializer(many=True) + ), + status.HTTP_400_BAD_REQUEST: OpenApiResponse( + description='Invalid query if the search string is empty or incorrect', + ), + }, + parameters=[ + OpenApiParameter( + name='q', + type=str, + description='Search query (plant name or description)', + required=True, + ), + ] + ) + @action(detail=False, methods=['get']) def search(self, request): query = request.query_params.get('q', '').lower() if not query: - return Response([]) + log.warning('Search query is required') + return Response({'error': 'Search query is required'}, status=status.HTTP_400_BAD_REQUEST) plants = PlantService.fuzzy_search(query) + if not plants: + log.info('No plants found matching the query') + return Response({'message': 'No plants found matching the query'}, status=status.HTTP_200_OK) + serializer = self.get_serializer(plants, many=True) + log.debug(f'Found {len(plants)} plants for query: {query}') return Response(serializer.data) + @extend_schema( + summary='Get search suggestions for plants', + description='Get plant suggestions based on a query string. This endpoint returns a list of suggestions for autocomplete or partial search.', + responses={ + status.HTTP_200_OK: OpenApiResponse( + description='List of plant suggestions based on the query', + response=str + ), + status.HTTP_400_BAD_REQUEST: OpenApiResponse( + description='Invalid query if the search string is empty or incorrect', + ) + }, + parameters=[ + OpenApiParameter( + name='q', + type=str, + description='Query string for suggestions (partial plant name)', + required=True, + ), + ] + ) @action(detail=False, methods=['get']) def suggestions(self, request): query = request.query_params.get('q', '').lower() if not query: - return Response([]) + log.warning('Query string is required') + return Response({'error': 'Query string is required'}, status=status.HTTP_400_BAD_REQUEST) suggestions = PlantService.get_suggestions(query) + if not suggestions: + log.info('No suggestions found for the given query') + return Response({'message': 'No suggestions found for the given query'}, status=status.HTTP_200_OK) + + log.debug(f'Found {len(suggestions)} suggestions for query: {query}') return Response(suggestions) @extend_schema( @@ -92,6 +157,7 @@ def suggestions(self, request): parameters=PlantParameters(required=True), ) def create(self, request, *args, **kwargs): + log.debug('Creating a new plant') return super().create(request, *args, **kwargs) @extend_schema( @@ -104,6 +170,7 @@ def create(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.debug('Retrieving a plant by ID') return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -116,6 +183,7 @@ def retrieve(self, request, *args, **kwargs): parameters=PlantParameters(), ) def partial_update(self, request, *args, **kwargs): + log.debug('Partially updating a plant') return super().partial_update(request, *args, **kwargs) @extend_schema( @@ -128,6 +196,7 @@ def partial_update(self, request, *args, **kwargs): parameters=PlantParameters(required=True), ) def update(self, request, *args, **kwargs): + log.debug('Updating a plant') return super().update(request, *args, **kwargs) @extend_schema( @@ -139,6 +208,7 @@ def update(self, request, *args, **kwargs): }, ) def destroy(self, request, *args, **kwargs): + log.debug('Deleting a plant') return super().destroy(request, *args, **kwargs) def BedPlantParameters(required=False): @@ -177,6 +247,7 @@ class BedPlantViewSet(viewsets.ModelViewSet): @extend_schema(exclude=True) def destroy(self, request, *args, **kwargs): + log.debug('Deleting a bed plant') return super().destroy(request, *args, **kwargs) @extend_schema( @@ -192,6 +263,7 @@ def destroy(self, request, *args, **kwargs): parameters=BedPlantParameters(required=True), ) def create(self, request, *args, **kwargs): + log.debug('Planting a new plant in a bed') return super().create(request, *args, **kwargs) @extend_schema( @@ -204,6 +276,7 @@ def create(self, request, *args, **kwargs): }, ) def list(self, request, *args, **kwargs): + log.debug('Listing all planted plants') return super().list(request, *args, **kwargs) @extend_schema( @@ -216,6 +289,7 @@ def list(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.debug('Retrieving a planted plant by ID') return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -228,6 +302,7 @@ def retrieve(self, request, *args, **kwargs): parameters=BedPlantParameters(required=True), ) def update(self, request, *args, **kwargs): + log.debug('Updating a planted plant') return super().update(request, *args, **kwargs) @extend_schema( @@ -240,12 +315,41 @@ def update(self, request, *args, **kwargs): parameters=BedPlantParameters(), ) def partial_update(self, request, *args, **kwargs): + log.debug('Partially updating a planted plant') return super().partial_update(request, *args, **kwargs) def perform_create(self, serializer): bed = serializer.validated_data['bed'] plant = serializer.validated_data['plant'] - BedPlantService.plant_in_bed(bed, plant) + fertilizer = serializer.validated_data.get['fertilizer', None] + beds_count = serializer.validated_data['beds_count', 1] + response = BedPlantService.plant_in_beds(bed.field, plant, beds_count, fertilizer=fertilizer) + log.info(f"Plant {plant.name} planted in bed with ID={bed.id}") + if isinstance(response, Response) and response.status_code != status.HTTP_201_CREATED: + raise ValidationError(response.data["error"]) + serializer.save() + + @extend_schema( + summary='Сhecking growth status', + description='Check the plant growth status', + responses={ + status.HTTP_200_OK: OpenApiResponse( + description='Plant harvested', + response=BedPlantSerializer(many=True) + ), + status.HTTP_400_BAD_REQUEST: OpenApiResponse( + description='Plant not found', + ), + }, + ) + @action(detail=True, methods=['get']) + def check_growth(self, request, pk=None): + bed_plant = self.get_object() + result = BedPlantService.check_plant(bed_plant) + if result: + return result + return Response({'status': f'Remaining growth time: {bed_plant.remaining_growth_time} days'}) + @extend_schema( summary='Harvest a plant', @@ -263,6 +367,7 @@ def perform_create(self, serializer): def harvest(self, request, pk=None): bed_plant = self.get_object() BedPlantService.harvest_plant(bed_plant) + log.info("Plant harvested") return Response({'status': 'plant harvested'}) @@ -280,11 +385,33 @@ def harvest(self, request, pk=None): ] ), status.HTTP_400_BAD_REQUEST: OpenApiResponse( - description='No suitable fertilizer found', + description='Error with the fertilization process', examples=[ OpenApiExample( name='No suitable fertilizer', value={'error': 'No suitable fertilizer found'}, + ), + OpenApiExample( + name='Fertilizer already applied', + value={'error': 'Fertilizer can only be applied once to a plant.'}, + ), + OpenApiExample( + name='Insufficient funds', + value={'error': 'Insufficient funds in the wallet. Please top up your balance.'}, + ), + OpenApiExample( + name='Growth time is too short', + value={ + 'error': "The plant's growth time must be at least 5 days longer than the fertilizer's boost time."}, + ), + ] + ), + status.HTTP_500_INTERNAL_SERVER_ERROR: OpenApiResponse( + description='Unexpected error occurred', + examples=[ + OpenApiExample( + name='Unexpected error occurred', + value={'error': 'Unexpected error occurred'}, ) ] ), @@ -292,10 +419,19 @@ def harvest(self, request, pk=None): ) @action(detail=True, methods=['post']) def fertilize(self, request, pk=None): + user = self.request.user bed_plant = self.get_object() plant_name = bed_plant.plant.name fertilizer = Fertilizer.objects.filter(compound__icontains=plant_name).first() - return BedPlantService.fertilize_plant(bed_plant, fertilizer) + log.debug(f"Fertilizing plant {plant_name} with {fertilizer.name}") + response = BedPlantService.fertilize_plant(bed_plant, fertilizer, user) + + if not isinstance(response, Response): + return Response( + {'error': 'Unexpected error occurred'}, + status=status.HTTP_500_INTERNAL_SERVER_ERROR + ) + return response @extend_schema( summary='Water a plant', @@ -316,6 +452,7 @@ def fertilize(self, request, pk=None): def water(self, request, pk=None): bed_plant = self.get_object() BedPlantService.water_plant(bed_plant) + log.debug("Watering plants is not implemented yet") return Response({'status': 'plant watered'}) @extend_schema( @@ -345,11 +482,14 @@ def water(self, request, pk=None): @action(detail=True, methods=['post']) def dig_up(self, request, pk=None): bed_plant = self.get_object() + log.debug("Digging up a plant") return BedPlantService.dig_up_plant(bed_plant) def get_queryset(self): fertilizer_applied = self.request.query_params.get('fertilizer_applied', None) if fertilizer_applied is not None: + log.debug(f"Filtering bed plants by fertilizer_applied={fertilizer_applied}") return BedPlantService.filter_bed_plants(fertilizer_applied=fertilizer_applied.lower() == 'true') + log.debug("Listing all bed plants") return BedPlant.objects.all() \ No newline at end of file diff --git a/django/tamprog/tamprog/settings.py b/django/tamprog/tamprog/settings.py index 8412a494..91b9e12c 100644 --- a/django/tamprog/tamprog/settings.py +++ b/django/tamprog/tamprog/settings.py @@ -55,6 +55,7 @@ 'fertilizer', 'drf_spectacular', 'rest_framework_simplejwt.token_blacklist', + 'django_db_logger', ] MIDDLEWARE = [ @@ -258,7 +259,27 @@ RABBITMQ_PORT = os.getenv('RABBITMQ_PORT', '5672') RABBITMQ_VHOST = os.getenv('RABBITMQ_VHOST', '/') -CELERY_BROKER_URL = f'amqp://{RABBITMQ_USER}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}' + +# Redis settings +REDIS_HOST = os.getenv('REDIS_HOST', 'localhost') \ + if IS_IN_CONTAINER \ + else 'localhost' +REDIS_PORT = os.getenv('REDIS_PORT', '6379') +REDIS_DB = os.getenv('REDIS_DB', '0') +REDIS_USER = os.getenv('REDIS_USER', 'default') +REDIS_PASSWORD = os.getenv('REDIS_PASS', 'admin') + +# Redis connection pool settings +REDIS_CONNECTION_POOL = { + 'max_connections': 20, + 'retry_on_timeout': True, + 'socket_timeout': 5, + 'socket_connect_timeout': 5, + 'retry': 3, + 'retry_delay': 1, # Delay between retries in seconds + 'connection_class': 'redis.connection.DefaultConnection', + 'retry_on_error': [ConnectionError, TimeoutError] +} CELERY_BROKER_CONNECTION_RETRY = bool(os.getenv( 'CELERY_BROKER_CONNECTION_RETRY', 'True').lower() == 'true') @@ -268,13 +289,54 @@ 'CELERY_BROKER_CONNECTION_MAX_RETRIES', '10')) CELERY_BROKER_HEARTBEAT = int(os.getenv( 'CELERY_BROKER_HEARTBEAT', '60')) +CELERY_BROKER_CONNECTION_TIMEOUT = 10 +CELERY_BROKER_POOL_LIMIT = 10 +CELERY_BROKER_TRANSPORT_OPTIONS = { + 'visibility_timeout': 7200, + 'max_retries': 5, + 'interval_start': 0, + 'interval_step': 0.2, + 'interval_max': 0.5, + 'connect_timeout': 10, + 'read_timeout': 10, + 'write_timeout': 10, +} + +CELERY_BROKER_URL = f'amqp://{RABBITMQ_USER}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}?heartbeat={CELERY_BROKER_HEARTBEAT}' + CELERY_WORKER_PREFETCH_MULTIPLIER = int(os.getenv( 'CELERY_WORKER_PREFETCH_MULTIPLIER', '1') \ if IS_IN_CONTAINER \ else '1') -CELERY_RESULT_BACKEND = os.getenv( - 'CELERY_RESULT_BACKEND', 'rpc://') +# Celery settings for proper result handling +CELERY_ACCEPT_CONTENT = ['json'] +CELERY_TASK_SERIALIZER = 'json' +CELERY_RESULT_SERIALIZER = 'json' + +# How long to keep task results (in seconds, 1 day = 86400) +CELERY_RESULT_EXPIRES = 86400 + +# CELERY_RESULT_BACKEND = os.getenv( + # 'CELERY_RESULT_BACKEND', 'rpc://') + +REDIS_URL = f'redis://{REDIS_USER}:{REDIS_PASSWORD}@{REDIS_HOST}:{REDIS_PORT}/{REDIS_DB}' + +CELERY_RESULT_BACKEND = REDIS_URL + +# Redis-specific Celery settings +CELERY_REDIS_MAX_CONNECTIONS = 20 +CELERY_REDIS_SOCKET_TIMEOUT = 15 +CELERY_REDIS_SOCKET_CONNECT_TIMEOUT = 15 +CELERY_REDIS_RETRY_ON_TIMEOUT = True + +# Store results even if task is ignored +CELERY_TASK_IGNORE_RESULT = False + +# Enable extended task result attributes +CELERY_TASK_TRACK_STARTED = True +CELERY_TASK_TIME_LIMIT = 30 * 60 # 30 minutes + # Acknowledge tasks after they are done [True/False] CELERY_TASK_ACKS_LATE = bool(os.getenv( 'CELERY_TASK_ACKS_LATE', 'True').lower() == 'true') @@ -309,5 +371,104 @@ os.getenv('CELERY_WORKER_TASK_LOG_FORMAT', '%(asctime)s - %(message)s') ) +# Optional: Redis cache settings +CACHES = { + 'default': { + 'BACKEND': 'django_redis.cache.RedisCache', + 'LOCATION': REDIS_URL, + 'OPTIONS': { + 'CLIENT_CLASS': 'django_redis.client.DefaultClient', + 'PASSWORD': REDIS_PASSWORD, + 'CONNECTION_POOL_CLASS_KWARGS': REDIS_CONNECTION_POOL, + 'RETRY_ON_TIMEOUT': True, + 'MAX_CONNECTIONS': 50, + 'SOCKET_CONNECT_TIMEOUT': 30, + 'SOCKET_TIMEOUT': 30, + 'RETRY_ON_CONNECTION_FAILURE': True, + 'CONNECTION_POOL_CLASS': 'redis.connection.ConnectionPool', + 'PARSER_CLASS': 'redis.connection.HiredisParser', + }, + 'KEY_PREFIX': 'tamprog', + 'TIMEOUT': 300, # 5 minutes default timeout + } +} + DJANGO_SUPER_USER = os.environ.get('DJANGO_SUPER_USER', 'admin') -DJANGO_SUPER_PASSWORD = os.environ.get('DJANGO_SUPER_PASSWORD', 'admin') \ No newline at end of file +DJANGO_SUPER_PASSWORD = os.environ.get('DJANGO_SUPER_PASSWORD', 'admin') + +DJANGO_DB_LOGGER_ENABLE_FORMATTER = True + +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s' + }, + 'simple': { + 'format': '%(levelname)s %(asctime)s %(message)s' + }, + }, + 'handlers': { + 'db_log': { + 'level': 'DEBUG', + 'class': 'django_db_logger.db_log_handler.DatabaseLogHandler', + 'formatter': 'verbose', + }, + 'console': { + 'class': 'logging.StreamHandler', + 'formatter': 'verbose', + } + }, + 'loggers': { + 'tamprog': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG' + }, + 'fertilizer': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG' + }, + 'garden': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG' + }, + 'orders': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG' + }, + 'plans': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG' + }, + 'user': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG' + }, + 'django.request': { # logging 500 errors to database + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'amqp': { + 'handlers': ['db_log', 'console'], + 'level': 'WARNING', + 'propagate': True, + }, + 'celery': { + 'handlers': ['db_log', 'console'], + 'level': 'WARNING', + 'propagate': True, + }, + 'redis_backend': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG', + 'propagate': True, + }, + 'redis': { + 'handlers': ['db_log', 'console'], + 'level': 'DEBUG', + 'propagate': True, + }, + } +} \ No newline at end of file diff --git a/django/tamprog/user/management/commands/auto_createsuperuser.py b/django/tamprog/user/management/commands/auto_createsuperuser.py index 5a083d7c..5a9617ad 100644 --- a/django/tamprog/user/management/commands/auto_createsuperuser.py +++ b/django/tamprog/user/management/commands/auto_createsuperuser.py @@ -5,6 +5,9 @@ from django.core.validators import validate_email from django.conf import settings from django.contrib.auth import get_user_model +from logging import getLogger + +log = getLogger(__name__) class Command(BaseCommand): help = 'Create a superuser with predefined credentials' @@ -26,6 +29,7 @@ def handle(self, *args, **options): if User.objects.filter(username=username).exists(): self.stdout.write(self.style.WARNING('Superuser already exists')) + log.info(f"Superuser {username} already exists") return user = User._default_manager.create( @@ -37,7 +41,10 @@ def handle(self, *args, **options): user.save() # User.objects.create_superuser(username=username, email=email, password=password) self.stdout.write(self.style.SUCCESS('Superuser created successfully')) + log.info(f"Superuser {username} created successfully") except AttributeError as e: self.stdout.write(self.style.ERROR('Missing required settings. Please check DJANGO_SUPER_USER, DJANGO_SUPER_EMAIL, and DJANGO_SUPER_PASSWORD in settings.py')) + log.error(f"Missing required settings. Please check DJANGO_SUPER_USER, DJANGO_SUPER_EMAIL, and DJANGO_SUPER_PASSWORD in settings.py") + log.exception(e) finally: User.REQUIRED_FIELDS = original_required \ No newline at end of file diff --git a/django/tamprog/user/migrations/0005_alter_person_wallet_balance_alter_worker_price.py b/django/tamprog/user/migrations/0005_alter_person_wallet_balance_alter_worker_price.py new file mode 100644 index 00000000..aada42cc --- /dev/null +++ b/django/tamprog/user/migrations/0005_alter_person_wallet_balance_alter_worker_price.py @@ -0,0 +1,24 @@ +# Generated by Django 4.2.16 on 2024-11-22 10:24 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0004_worker_description_worker_price'), + ] + + operations = [ + migrations.AlterField( + model_name='person', + name='wallet_balance', + field=models.FloatField(default=0.0, validators=[django.core.validators.MinValueValidator(0)]), + ), + migrations.AlterField( + model_name='worker', + name='price', + field=models.FloatField(default=0.0, validators=[django.core.validators.MinValueValidator(0)]), + ), + ] diff --git a/django/tamprog/user/models.py b/django/tamprog/user/models.py index 97813a8b..7a74b8b0 100644 --- a/django/tamprog/user/models.py +++ b/django/tamprog/user/models.py @@ -1,33 +1,41 @@ from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin from django.db import models -from django.core.validators import RegexValidator +from django.core.validators import RegexValidator, MinValueValidator from django.core.exceptions import ValidationError import re +from logging import getLogger + +log = getLogger(__name__) class PersonManager(BaseUserManager): def create_user(self, username, full_name, phone_number, password=None, **extra_fields): if not username: + log.error("The Username field must be set") raise ValueError("The Username field must be set") if not phone_number: + log.error("The Phone Number field must be set") raise ValueError("The Phone Number field must be set") if not extra_fields.get("is_superuser", False): if re.match(r'^agronom\d$', username): + log.error("Usernames starting with 'agronom' followed by a digit are reserved for superusers.") raise ValueError("Usernames starting with 'agronom' followed by a digit are reserved for superusers.") user = self.model(username=username, full_name=full_name, phone_number=phone_number, **extra_fields) user.set_password(password) user.save(using=self._db) + log.info(f"User {username} created successfully") return user def create_superuser(self, username, full_name, phone_number, password=None, **extra_fields): extra_fields.setdefault("is_staff", True) extra_fields.setdefault("is_superuser", True) + log.info(f"Creating superuser {username}") return self.create_user(username, full_name, phone_number, password, **extra_fields) class Person(AbstractBaseUser, PermissionsMixin): username = models.CharField(max_length=255, unique=True) - wallet_balance = models.FloatField(default=0.00) + wallet_balance = models.FloatField(default=0.00, validators=[MinValueValidator(0)]) full_name = models.CharField(max_length=255) phone_number = models.CharField( max_length=15, @@ -52,5 +60,5 @@ class Agronomist(models.Model): class Worker(models.Model): name = models.CharField(max_length=255) - price = models.FloatField(default=0.00) + price = models.FloatField(default=0.00, validators=[MinValueValidator(0)]) description = models.TextField() diff --git a/django/tamprog/user/permission.py b/django/tamprog/user/permission.py index 3fee41a3..c891c63c 100644 --- a/django/tamprog/user/permission.py +++ b/django/tamprog/user/permission.py @@ -1,10 +1,15 @@ from rest_framework.permissions import BasePermission import re +from logging import getLogger + +log = getLogger(__name__) class PostOnly(BasePermission): def has_permission(self, request, view): if request.method == 'POST': + log.debug("User is allowed to POST") return True + log.debug("User is not allowed to POST") return request.user and request.user.is_authenticated class AgronomistPermission(BasePermission): @@ -12,14 +17,20 @@ def has_permission(self, request, view): if request.user and request.user.is_authenticated: username = request.user.username if re.match(r'^agronom\d+$', username): + log.debug(f"User {username} is an agronomist") return True if request.user.is_superuser: + log.debug(f"User {username} is a superuser") return True + log.debug(f"User {username} is not an agronomist") return request.method in ['GET', 'HEAD', 'OPTIONS'] + log.debug("User is not authenticated") return False class NoPostAllowed(BasePermission): def has_permission(self, request, view): if request.method == "POST": + log.debug("User is not allowed to POST") return False + log.debug("User is allowed to POST") return True \ No newline at end of file diff --git a/django/tamprog/user/queries.py b/django/tamprog/user/queries.py index 3c0080be..ac407140 100644 --- a/django/tamprog/user/queries.py +++ b/django/tamprog/user/queries.py @@ -1,11 +1,14 @@ from .models import Worker +from logging import getLogger +log = getLogger(__name__) class GetWorkersSortedByID: def __init__(self, ascending: bool = True): self.ascending = ascending def execute(self): + log.debug('Calling GetWorkersSortedByID::execute method') return Worker.objects.order_by('id' if self.ascending else '-id') @@ -14,6 +17,7 @@ def __init__(self, ascending: bool = True): self.ascending = ascending def execute(self): + log.debug('Calling GetWorkersSortedByName::execute method') return Worker.objects.order_by('name' if self.ascending else '-name') @@ -22,6 +26,7 @@ def __init__(self, ascending: bool = True): self.ascending = ascending def execute(self): + log.debug('Calling GetWorkersSortedByPrice::execute method') return Worker.objects.order_by('price' if self.ascending else '-price') @@ -30,4 +35,5 @@ def __init__(self, ascending: bool = True): self.ascending = ascending def execute(self): + log.debug('Calling GetWorkersSortedByDescription::execute method') return Worker.objects.order_by('description' if self.ascending else '-description') \ No newline at end of file diff --git a/django/tamprog/user/serializers.py b/django/tamprog/user/serializers.py index e478348e..8551f5aa 100644 --- a/django/tamprog/user/serializers.py +++ b/django/tamprog/user/serializers.py @@ -3,6 +3,9 @@ from rest_framework import serializers from django.contrib.auth import get_user_model from rest_framework_simplejwt.tokens import RefreshToken +from logging import getLogger + +log = getLogger(__name__) User = get_user_model() @@ -19,7 +22,10 @@ class Meta: def validate_phone_number(self, value): if User.objects.filter(phone_number=value).exists(): - raise serializers.ValidationError("User with this phone number already exists.") + e = serializers.ValidationError("User with this phone number already exists.") + log.exception(e) + raise e + log.debug("Phone number is valid") return value class LoginSerializer(serializers.Serializer): diff --git a/django/tamprog/user/services.py b/django/tamprog/user/services.py index 4cfe5bbb..0df482dd 100644 --- a/django/tamprog/user/services.py +++ b/django/tamprog/user/services.py @@ -8,6 +8,10 @@ from django.forms.models import model_to_dict from django.conf import settings +from logging import getLogger + +log = getLogger(__name__) + User = get_user_model() class PersonService: @@ -20,22 +24,26 @@ def create_user(username, full_name, phone_number, password, wallet_balance=0.00 password=password, wallet_balance=wallet_balance ) + log.info(f"User {username} created successfully") return user @staticmethod def update_wallet_balance(user, amount): if user.wallet_balance is None: + log.error("Wallet balance is not set for this user") return Response( {'error': 'Wallet balance is not set for this user'}, status=status.HTTP_400_BAD_REQUEST ) if user.wallet_balance < amount: + log.error("Insufficient funds in the wallet") return Response( {'error': 'Insufficient funds in the wallet'}, status=status.HTTP_400_BAD_REQUEST ) user.wallet_balance -= amount user.save(update_fields=['wallet_balance']) + log.info(f"Wallet balance updated successfully for user {user.username}") return Response( {'status': 'Wallet balance updated successfully'}, status=status.HTTP_200_OK @@ -52,14 +60,19 @@ def get_sorted_workers_task(sort_by: str = 'id', ascending: bool = True): elif sort_by == 'description': query = GetWorkersSortedByDescription(ascending) else: + log.error(f"Invalid sorting parameter: {sort_by}") return [] # Convert QuerySet to list of dictionaries queryset = query.execute() + log.info(f"Found {len(queryset)} workers sorted by {sort_by}") return [model_to_dict(field) for field in queryset] class WorkerService: @staticmethod def get_sorted_workers(sort_by: str = 'price', ascending: bool = True): + log.debug(f"Getting workers sorted by {sort_by}") task = get_sorted_workers_task.delay('price', ascending) result = AsyncResult(task.id) - return result.get(timeout=settings.DJANGO_ASYNC_TIMEOUT_S) \ No newline at end of file + result = result.get(timeout=settings.DJANGO_ASYNC_TIMEOUT_S) + log.info(f"Received sorted workers from Celery task") + return result \ No newline at end of file diff --git a/django/tamprog/user/tests.py b/django/tamprog/user/tests.py index e2f2ebe1..3021ac88 100644 --- a/django/tamprog/user/tests.py +++ b/django/tamprog/user/tests.py @@ -2,107 +2,84 @@ from rest_framework import status from unittest.mock import patch, MagicMock from user.models import Worker -from user.services import WorkerService +from user.services import WorkerService,PersonService from django.contrib.auth import get_user_model - +from rest_framework.test import APIClient +from rest_framework_simplejwt.tokens import RefreshToken +from user.views import LogoutView +from mixer.backend.django import mixer User = get_user_model() @pytest.mark.django_db -def test_register_user(api_client): +def test_register_user(api_client, register_data): """Тест успешной регистрации нового пользователя.""" url = '/api/v1/register/' - data = { - 'username': 'newuser', - 'phone_number': '+1234567890', - 'full_name': 'New User', - 'password': 'newpassword', - 'wallet_balance': 100.00 - } - response = api_client.post(url, data, format='json') + response = api_client.post(url, register_data, format='json') assert response.status_code == status.HTTP_201_CREATED - assert User.objects.filter(username='newuser').exists() + assert User.objects.filter(username=register_data['username']).exists() + @pytest.mark.django_db -def test_register_user_existing_username(api_client, user): +def test_register_user_existing_username(api_client, register_data, user): """Тест на регистрацию пользователя с уже существующим именем.""" + register_data['username'] = user.username url = '/api/v1/register/' - data = { - 'username': user.username, - 'phone_number': '+1234567890', - 'full_name': 'New User', - 'password': 'newpassword', - 'wallet_balance': 50.00 - } - response = api_client.post(url, data, format='json') + response = api_client.post(url, register_data, format='json') assert response.status_code == status.HTTP_400_BAD_REQUEST assert "username" in response.data + @pytest.mark.django_db def test_register_user_missing_fields(api_client): """Тест на регистрацию без обязательных полей.""" url = '/api/v1/register/' - data = { - 'username': 'incompleteuser' - # Пропущены обязательные поля - } - response = api_client.post(url, data, format='json') + response = api_client.post(url, {}, format='json') assert response.status_code == status.HTTP_400_BAD_REQUEST + assert "username" in response.data assert "phone_number" in response.data assert "password" in response.data + @pytest.mark.django_db -def test_register_user_invalid_phone_number(api_client): +def test_register_user_invalid_phone_number(api_client, register_data): """Тест на регистрацию с неверным форматом номера телефона.""" + register_data['phone_number'] = 'invalid_phone' url = '/api/v1/register/' - data = { - 'username': 'user_invalid_phone', - 'phone_number': 'invalid_phone', - 'full_name': 'New User', - 'password': 'newpassword', - 'wallet_balance': 100.00 - } - response = api_client.post(url, data, format='json') + response = api_client.post(url, register_data, format='json') assert response.status_code == status.HTTP_400_BAD_REQUEST assert "phone_number" in response.data + @pytest.mark.django_db def test_login_user(api_client, user): """Тест успешного входа с корректными данными.""" - user.set_password('testpassword') - user.save() url = '/api/v1/login/' - data = { - 'username': user.username, - 'password': 'testpassword' - } + data = {'username': user.username, 'password': 'testpassword'} response = api_client.post(url, data, format='json') assert response.status_code == status.HTTP_200_OK assert 'access' in response.data assert 'refresh' in response.data assert 'wallet_balance' in response.data + @pytest.mark.django_db def test_login_user_invalid_credentials(api_client): """Тест на вход с неверными данными.""" url = '/api/v1/login/' - data = { - 'username': 'nonexistentuser', - 'password': 'wrongpassword' - } + data = {'username': 'nonexistentuser', 'password': 'wrongpassword'} response = api_client.post(url, data, format='json') assert response.status_code == status.HTTP_400_BAD_REQUEST assert "detail" in response.data assert response.data["detail"] == "Invalid credentials" + @pytest.mark.django_db def test_login_user_missing_fields(api_client): """Тест на вход с отсутствующими обязательными полями.""" url = '/api/v1/login/' - data = { - 'username': 'testuser' - } - response = api_client.post(url, data, format='json') + response = api_client.post(url, {}, format='json') assert response.status_code == status.HTTP_400_BAD_REQUEST + assert "username" in response.data assert "password" in response.data @pytest.mark.django_db @@ -142,3 +119,57 @@ def test_get_sorted_workers_descending(mock_async_result, mock_task, workers): assert [worker.price for worker in sorted_workers] == sorted([worker.price for worker in workers], reverse=True) +@pytest.mark.django_db +@patch('rest_framework_simplejwt.tokens.RefreshToken.for_user') +def test_logout_user_success(mock_refresh_token, api_client, user): + """Тест успешного выхода пользователя из системы.""" + mock_refresh_token_instance = MagicMock() + mock_refresh_token.return_value = mock_refresh_token_instance + api_client.force_authenticate(user=user) + url = '/api/v1/logout/' + response = api_client.post(url, format='json') + assert response.status_code == status.HTTP_200_OK + assert response.data["message"] == "Exit successful" + mock_refresh_token_instance.blacklist.assert_called_once() + +@pytest.mark.django_db +@patch('rest_framework_simplejwt.tokens.RefreshToken.for_user') +def test_logout_user_not_authenticated(mock_refresh_token, api_client): + """Тест выхода пользователя без авторизации.""" + url = '/api/v1/logout/' + response = api_client.post(url, format='json') + assert response.status_code == status.HTTP_401_UNAUTHORIZED + assert "detail" in response.data + assert response.data["detail"] == "Authentication credentials were not provided." + +@pytest.mark.django_db +@patch('rest_framework_simplejwt.tokens.RefreshToken.for_user') +def test_logout_user_exception(mock_refresh_token, api_client, user): + """Тест выхода пользователя с ошибкой при блокировке refresh токена.""" + mock_refresh_token_instance = MagicMock() + mock_refresh_token_instance.blacklist.side_effect = Exception("Some error") + mock_refresh_token.return_value = mock_refresh_token_instance + api_client.force_authenticate(user=user) + url = '/api/v1/logout/' + response = api_client.post(url, format='json') + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert "error" in response.data + assert response.data["error"] == "Some error" + mock_refresh_token_instance.blacklist.assert_called_once() + +@pytest.mark.django_db +def test_update_wallet_balance_on_order_creation(api_client, user): + order = mixer.blend('orders.Order', user=user, total_cost=0.00) + initial_balance = user.wallet_balance + response = PersonService.update_wallet_balance(user, order.total_cost) + assert response.status_code == status.HTTP_200_OK + assert user.wallet_balance == initial_balance - order.total_cost + +@pytest.mark.django_db +def test_insufficient_funds_on_order_creation(api_client, user): + order = mixer.blend('orders.Order', user=user, total_cost=200.00) + response = PersonService.update_wallet_balance(user, order.total_cost) + assert response.status_code == status.HTTP_400_BAD_REQUEST + assert response.data['error'] == 'Insufficient funds in the wallet' + + diff --git a/django/tamprog/user/views.py b/django/tamprog/user/views.py index 960c338f..dba949f0 100644 --- a/django/tamprog/user/views.py +++ b/django/tamprog/user/views.py @@ -7,9 +7,12 @@ from rest_framework_simplejwt.tokens import RefreshToken from rest_framework.response import Response from rest_framework.views import APIView -from rest_framework.permissions import AllowAny, IsAdminUser, IsAuthenticated +from rest_framework.permissions import AllowAny, IsAdminUser, IsAuthenticated, IsAuthenticatedOrReadOnly from .services import * from django.contrib.auth import get_user_model +from logging import getLogger + +log = getLogger(__name__) from drf_spectacular.utils import extend_schema, extend_schema_view, \ OpenApiResponse, OpenApiParameter, OpenApiExample @@ -47,9 +50,12 @@ class LoginView(generics.GenericAPIView): OpenApiExample( name="Successful login", value={ + "id": 1, + "username": "example_user", "refresh": "string", "access": "string", "wallet_balance": 0.00, + "is_staff": False, }, ) ], @@ -79,11 +85,16 @@ def post(self, request, *args, **kwargs): ) if user is not None: refresh = RefreshToken.for_user(user) + log.info(f"User {user.username} logged in successfully") return Response({ + 'id': user.id, + 'username': user.username, 'refresh': str(refresh), 'access': str(refresh.access_token), 'wallet_balance': user.wallet_balance, + 'is_staff': user.is_staff, }) + log.error("Invalid credentials") return Response({"detail": "Invalid credentials"}, status=400) @@ -94,8 +105,10 @@ def post(self, request, *args, **kwargs): try: refresh_token = RefreshToken.for_user(request.user) refresh_token.blacklist() + log.info(f"User {request.user.username} logged out successfully") return Response({"message": "Exit successful"}, status=status.HTTP_200_OK) except Exception as e: + log.exception(e) return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST) def RegisterParameters(required=False): @@ -151,6 +164,7 @@ class RegisterViewSet(viewsets.ModelViewSet): "message": "User created successfully", "user_id": 0, "username": "string", + 'is_staff': False, }, ) ], @@ -184,13 +198,19 @@ def create(self, request, *args, **kwargs): wallet_balance=serializer.validated_data.get('wallet_balance', 0.00) ) except ValueError as e: + log.exception(e) return Response( {'error': str(e)}, status=status.HTTP_400_BAD_REQUEST ) headers = self.get_success_headers(serializer.data) + log.info(f"User {user.username} registered successfully") return Response( - {"message": "User created successfully", "user_id": user.id, "username": user.username}, + {"message": "User created successfully", + "user_id": user.id, + "username": user.username, + 'is_staff': user.is_staff, + }, status=status.HTTP_201_CREATED, headers=headers ) @@ -221,7 +241,7 @@ def PersonParameters(required=False): class PersonViewSet(viewsets.ModelViewSet): queryset = Person.objects.all() serializer_class = PersonSerializer - permission_classes = [IsAdminUser, NoPostAllowed] + permission_classes = [IsAuthenticatedOrReadOnly] @extend_schema( summary='Get all users', @@ -233,6 +253,7 @@ class PersonViewSet(viewsets.ModelViewSet): }, ) def list(self, request, *args, **kwargs): + log.info("Getting all users") return super().list(request, *args, **kwargs) @extend_schema( @@ -245,6 +266,7 @@ def list(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.info(f"Getting user by ID: {kwargs['pk']}") return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -257,6 +279,7 @@ def retrieve(self, request, *args, **kwargs): parameters=PersonParameters(required=True), ) def update(self, request, *args, **kwargs): + log.info(f"Updating user by ID: {kwargs['pk']}") return super().update(request, *args, **kwargs) @extend_schema( @@ -269,6 +292,7 @@ def update(self, request, *args, **kwargs): parameters=PersonParameters(), ) def partial_update(self, request, *args, **kwargs): + log.info(f"Partially updating user by ID: {kwargs['pk']}") return super().partial_update(request, *args, **kwargs) @extend_schema( @@ -280,10 +304,12 @@ def partial_update(self, request, *args, **kwargs): }, ) def destroy(self, request, *args, **kwargs): + log.info(f"Deleting user by ID: {kwargs['pk']}") return super().destroy(request, *args, **kwargs) @extend_schema(exclude=True) def create(self, request, *args, **kwargs): + log.error("Method not allowed") return super().create(request, *args, **kwargs) def WorkerParameters(required=False): @@ -343,6 +369,7 @@ def list(self, request, *args, **kwargs): ascending = request.query_params.get('asc', 'true').lower() == 'true' workers = WorkerService.get_sorted_workers('price', ascending) serializer = self.get_serializer(workers, many=True) + log.info(f"Getting all workers sorted by {sort_by} in {'ascending' if ascending else 'descending'} order") return Response(serializer.data) @extend_schema( @@ -355,6 +382,7 @@ def list(self, request, *args, **kwargs): }, ) def retrieve(self, request, *args, **kwargs): + log.info(f"Getting worker by ID: {kwargs['pk']}") return super().retrieve(request, *args, **kwargs) @extend_schema( @@ -367,6 +395,7 @@ def retrieve(self, request, *args, **kwargs): parameters=WorkerParameters(required=True), ) def create(self, request, *args, **kwargs): + log.error("Method not allowed") return super().create(request, *args, **kwargs) @extend_schema( @@ -379,6 +408,7 @@ def create(self, request, *args, **kwargs): parameters=WorkerParameters(required=True), ) def update(self, request, *args, **kwargs): + log.info(f"Updating worker by ID: {kwargs['pk']}") return super().update(request, *args, **kwargs) @extend_schema( @@ -391,6 +421,7 @@ def update(self, request, *args, **kwargs): parameters=WorkerParameters(), ) def partial_update(self, request, *args, **kwargs): + log.info(f"Partially updating worker by ID: {kwargs['pk']}") return super().partial_update(request, *args, **kwargs) @extend_schema( @@ -402,5 +433,6 @@ def partial_update(self, request, *args, **kwargs): }, ) def destroy(self, request, *args, **kwargs): + log.info(f"Deleting worker by ID: {kwargs['pk']}") return super().destroy(request, *args, **kwargs) \ No newline at end of file diff --git a/docker-compose-build.yml b/docker-compose-build.yml index d054c31f..290f070a 100644 --- a/docker-compose-build.yml +++ b/docker-compose-build.yml @@ -23,9 +23,12 @@ services: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} PGDATA: "/var/lib/postgresql/data/pgdata" + # POSTGRES_INITDB_ARGS: "--max-connections=1500" + POSTGRES_MAX_CONNECTIONS: "1500" volumes: - db-data:/docker-entrypoint-initdb.d - db-data:/var/lib/postgresql/data + command: postgres -c max_connections=1500 ports: - "${POSTGRES_PORT}:5432" restart: always @@ -54,6 +57,8 @@ services: - ${RABBITMQ_PORT}:5672 networks: - gateway + depends_on: + - redis healthcheck: test: ["CMD-SHELL", "rabbitmqctl start_app && rabbitmqctl status"] interval: 30s diff --git a/docker-compose.yml b/docker-compose.yml index d66a6aa1..2d296488 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,9 +22,12 @@ services: POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} PGDATA: "/var/lib/postgresql/data/pgdata" + # POSTGRES_INITDB_ARGS: "--max-connections=1500" + POSTGRES_MAX_CONNECTIONS: "1500" volumes: - db-data:/docker-entrypoint-initdb.d - db-data:/var/lib/postgresql/data + command: postgres -c max_connections=1500 ports: - "${POSTGRES_PORT}:5432" restart: always @@ -53,6 +56,8 @@ services: - ${RABBITMQ_PORT}:5672 networks: - gateway + depends_on: + - redis healthcheck: test: ["CMD-SHELL", "rabbitmqctl start_app && rabbitmqctl status"] interval: 30s diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 2cec4142..da0bfe5d 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,27 +1,40 @@ -# Use the official Node.js 20.17 image as the base image -FROM node:20-alpine +# Build stage +FROM node:20-alpine AS builder -# Set the working directory inside the container WORKDIR /usr/src/app -# Copy the package.json and yarn.lock files to the working directory -COPY package.json yarn.lock ./ +# Set production environment +ENV NODE_ENV=production -# Install the dependencies using yarn -RUN yarn install +# Copy package files +COPY package*.json ./ -# Install curl for healthcheck -RUN apk add --no-cache curl +# Install dependencies with production flags and clean cache in same layer +RUN npm install --production --silent && \ + npm cache clean --force -# Copy the rest of the application code to the working directory +# Copy source code COPY . . -# Expose the port the application will run on -EXPOSE 3000 +# Build production assets +RUN npm run build + +# Runtime stage +FROM nginx:alpine-slim + +# Copy nginx config +COPY nginx.conf /etc/nginx/conf.d/default.conf + +# Copy built assets from builder +COPY --from=builder /usr/src/app/build /usr/share/nginx/html -# Define the command to run the application -CMD ["yarn", "start"] +# Install curl for healthcheck in same layer as cleanup +RUN apk add --no-cache curl && \ + rm -rf /var/cache/apk/* + +EXPOSE 3000 -# Add a healthcheck to ensure the container is running correctly HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \ - CMD curl -f http://localhost:3000/ || exit 1 \ No newline at end of file + CMD curl -f http://localhost/ || exit 1 + +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/frontend/nginx.conf b/frontend/nginx.conf new file mode 100644 index 00000000..35ada6c2 --- /dev/null +++ b/frontend/nginx.conf @@ -0,0 +1,33 @@ +server { + listen 3000; + server_name localhost; + root /usr/share/nginx/html; + index index.html; + + # Enable gzip compression + gzip on; + gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; + + # Logs + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + # Security headers + add_header X-Frame-Options "SAMEORIGIN"; + add_header X-Content-Type-Options "nosniff"; + + location / { + try_files $uri $uri/ /index.html =404; + include /etc/nginx/mime.types; + } + + # Cache static assets + location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2)$ { + expires 1y; + add_header Cache-Control "public, no-transform"; + access_log off; + } + + # Handle 404 errors + error_page 404 /index.html; +} \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 5e88b572..4ad475d5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,13 +6,19 @@ "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^13.0.0", "@testing-library/user-event": "^13.2.1", + "assert": "^2.1.0", "axios": "^1.7.7", "boxicons": "^2.1.4", + "chai": "^5.1.2", + "crypto-browserify": "^3.12.1", + "os-browserify": "^0.3.0", + "path-browserify": "^1.0.1", "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.26.2", "react-scripts": "5.0.1", "react-transition-group": "^4.4.5", + "tmp": "^0.2.3", "web-vitals": "^2.1.0" }, "scripts": { @@ -39,5 +45,9 @@ "last 1 safari version" ] }, - "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e", + "devDependencies": { + "mocha": "^10.8.2", + "selenium-webdriver": "^4.26.0" + } } diff --git a/frontend/public/arrow-down-svgrepo-com.svg b/frontend/public/arrow-down-svgrepo-com.svg new file mode 100644 index 00000000..ad141996 --- /dev/null +++ b/frontend/public/arrow-down-svgrepo-com.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/frontend/public/arrow-left-svgrepo-com.svg b/frontend/public/arrow-left-svgrepo-com.svg new file mode 100644 index 00000000..c315b51c --- /dev/null +++ b/frontend/public/arrow-left-svgrepo-com.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/frontend/public/arrow-right-svgrepo-com.svg b/frontend/public/arrow-right-svgrepo-com.svg new file mode 100644 index 00000000..536a5de3 --- /dev/null +++ b/frontend/public/arrow-right-svgrepo-com.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/frontend/public/arrow-up-svgrepo-com.svg b/frontend/public/arrow-up-svgrepo-com.svg new file mode 100644 index 00000000..d4b503e0 --- /dev/null +++ b/frontend/public/arrow-up-svgrepo-com.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico new file mode 100644 index 00000000..ed474256 Binary files /dev/null and b/frontend/public/favicon.ico differ diff --git a/frontend/public/ferma.jpg b/frontend/public/ferma.jpg new file mode 100644 index 00000000..7477777a Binary files /dev/null and b/frontend/public/ferma.jpg differ diff --git a/frontend/public/index.html b/frontend/public/index.html index 14d57037..ed35c7b5 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -25,7 +25,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + TamProg diff --git a/frontend/public/phone.png b/frontend/public/phone.png new file mode 100644 index 00000000..87cffffd Binary files /dev/null and b/frontend/public/phone.png differ diff --git a/frontend/public/plus.svg b/frontend/public/plus.svg new file mode 100644 index 00000000..bc3fd694 --- /dev/null +++ b/frontend/public/plus.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/frontend/public/search.svg b/frontend/public/search.svg new file mode 100644 index 00000000..6a4b0758 --- /dev/null +++ b/frontend/public/search.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/public/tamprog-logo.svg b/frontend/public/tamprog-logo.svg new file mode 100644 index 00000000..d5ff52f6 --- /dev/null +++ b/frontend/public/tamprog-logo.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/public/tenor.gif b/frontend/public/tenor.gif deleted file mode 100644 index cff772df..00000000 Binary files a/frontend/public/tenor.gif and /dev/null differ diff --git a/frontend/public/user_icon.png b/frontend/public/user_icon.png new file mode 100644 index 00000000..ee2e2f05 Binary files /dev/null and b/frontend/public/user_icon.png differ diff --git a/frontend/public/user_plus.png b/frontend/public/user_plus.png new file mode 100644 index 00000000..285d8951 Binary files /dev/null and b/frontend/public/user_plus.png differ diff --git a/frontend/src/App.css b/frontend/src/App.css index 331170a8..325588a2 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -1,38 +1,34 @@ -@import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap'); +@import url("https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap"); * { - font-family: "Nunito", sans-serif; - box-sizing: border-box; + font-family: "Nunito", sans-serif; + box-sizing: border-box; } -*::-webkit-scrollbar-track -{ - -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3); +*::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } -*::-webkit-scrollbar -{ - width: 10px; - background-color: #F5F5F5; - border-radius: 10px; - +*::-webkit-scrollbar { + width: 10px; + background-color: #f5f5f5; + border-radius: 10px; } -*::-webkit-scrollbar-thumb -{ - border-radius: 10px; - background-color: #96c2a8;; - background-image: -webkit-linear-gradient(45deg, - rgba(255, 255, 255, .2) 25%, - transparent 25%, - transparent 50%, - rgba(255, 255, 255, .2) 50%, - rgba(255, 255, 255, .2) 75%, - transparent 75%, - transparent) +*::-webkit-scrollbar-thumb { + border-radius: 10px; + background-color: #96c2a8; + background-image: -webkit-linear-gradient( + 45deg, + rgba(255, 255, 255, 0.2) 25%, + transparent 25%, + transparent 50%, + rgba(255, 255, 255, 0.2) 50%, + rgba(255, 255, 255, 0.2) 75%, + transparent 75%, + transparent + ); } body { - height: 100%; - background-color: #1d1003; - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='600' height='600' viewBox='0 0 600 600'%3E%3Cpath fill='%234a2a0d' fill-opacity='0.4' d='M600 325.1v-1.17c-6.5 3.83-13.06 7.64-14.68 8.64-10.6 6.56-18.57 12.56-24.68 19.09-5.58 5.95-12.44 10.06-22.42 14.15-1.45.6-2.96 1.2-4.83 1.9l-4.75 1.82c-9.78 3.75-14.8 6.27-18.98 10.1-4.23 3.88-9.65 6.6-16.77 8.84-1.95.6-3.99 1.17-6.47 1.8l-6.14 1.53c-5.29 1.35-8.3 2.37-10.54 3.78-3.08 1.92-6.63 3.26-12.74 5.03a384.1 384.1 0 0 1-4.82 1.36c-2.04.58-3.6 1.04-5.17 1.52a110.03 110.03 0 0 0-11.2 4.05c-2.7 1.15-5.5 3.93-8.78 8.4a157.68 157.68 0 0 0-6.15 9.2c-5.75 9.07-7.58 11.74-10.24 14.51a50.97 50.97 0 0 1-4.6 4.22c-2.33 1.9-10.39 7.54-11.81 8.74a14.68 14.68 0 0 0-3.67 4.15c-1.24 2.3-1.9 4.57-2.78 8.87-2.17 10.61-3.52 14.81-8.2 22.1-4.07 6.33-6.8 9.88-9.83 12.99-.47.48-.95.96-1.5 1.48l-3.75 3.56c-1.67 1.6-3.18 3.12-4.86 4.9a42.44 42.44 0 0 0-9.89 16.94c-2.5 8.13-2.72 15.47-1.76 27.22.47 5.82.51 6.36.51 8.18 0 10.51.12 17.53.63 25.78.24 4.05.56 7.8.97 11.22h.9c-1.13-9.58-1.5-21.83-1.5-37 0-1.86-.04-2.4-.52-8.26-.94-11.63-.72-18.87 1.73-26.85a41.44 41.44 0 0 1 9.65-16.55c1.67-1.76 3.18-3.27 4.83-4.85.63-.6 3.13-2.96 3.75-3.57a71.6 71.6 0 0 0 1.52-1.5c3.09-3.16 5.86-6.76 9.96-13.15 4.77-7.42 6.15-11.71 8.34-22.44.86-4.21 1.5-6.4 2.68-8.6.68-1.25 1.79-2.48 3.43-3.86 1.38-1.15 9.43-6.8 11.8-8.72 1.71-1.4 3.26-2.81 4.7-4.3 2.72-2.85 4.56-5.54 10.36-14.67a156.9 156.9 0 0 1 6.1-9.15c3.2-4.33 5.9-7.01 8.37-8.07 3.5-1.5 7.06-2.77 11.1-4.02a233.84 233.84 0 0 1 7.6-2.2l2.38-.67c6.19-1.79 9.81-3.16 12.98-5.15 2.14-1.33 5.08-2.33 10.27-3.65l6.14-1.53c2.5-.63 4.55-1.2 6.52-1.82 7.24-2.27 12.79-5.06 17.15-9.05 4.05-3.72 9-6.2 18.66-9.9l4.75-1.82c1.87-.72 3.39-1.31 4.85-1.91 10.1-4.15 17.07-8.32 22.76-14.4 6.05-6.45 13.95-12.4 24.49-18.92 1.56-.96 7.82-4.6 14.15-8.33v-64.58c-4 8.15-8.52 14.85-12.7 17.9-2.51 1.82-5.38 4.02-9.04 6.92a1063.87 1063.87 0 0 0-6.23 4.98l-1.27 1.02a2309.25 2309.25 0 0 1-4.87 3.9c-7.55 6-12.9 10.05-17.61 13.19-3.1 2.06-3.86 2.78-8.06 7.13-5.84 6.07-11.72 8.62-29.15 10.95-11.3 1.5-20.04 4.91-30.75 11.07-1.65.94-7.27 4.27-6.97 4.1-2.7 1.58-4.69 2.69-6.64 3.66-5.63 2.8-10.47 4.17-15.71 4.17-17.13 0-41.44 11.51-51.63 22.83-12.05 13.4-31.42 27.7-45.25 31.16-7.4 1.85-11.85 7.05-14.04 14.69-1.26 4.4-1.58 8.28-1.58 13.82 0 .82.01.98.24 3.63.45 5.18.35 8.72-.77 13.26-1.53 6.2-4.89 12.6-10.59 19.43-13.87 16.65-22.88 46.58-22.88 71.68 0 2.39.02 4.26.06 8.75.12 10.8.1 15.8-.22 21.95-.56 11.18-2.09 20.73-5 29.3h-1.05c2.94-8.56 4.49-18.12 5.05-29.35.31-6.13.34-11.1.22-21.9-.04-4.48-.06-6.36-.06-8.75 0-25.32 9.07-55.47 23.12-72.32 5.6-6.72 8.88-12.99 10.38-19.03 1.09-4.4 1.18-7.85.74-12.93-.23-2.7-.24-2.86-.24-3.72 0-5.62.32-9.57 1.62-14.1 2.28-7.95 6.97-13.44 14.76-15.39 13.6-3.4 32.82-17.59 44.75-30.84C409 360.14 433.58 348.5 451 348.5c5.07 0 9.77-1.33 15.26-4.07 1.93-.96 3.9-2.05 6.58-3.62-.3.18 5.33-3.16 6.98-4.11 10.82-6.21 19.66-9.67 31.11-11.2 17.23-2.3 22.9-4.75 28.57-10.64 4.25-4.41 5.04-5.16 8.22-7.28 4.68-3.11 10.01-7.14 17.55-13.14a1113.33 1113.33 0 0 0 4.86-3.89l1.28-1.02a4668.54 4668.54 0 0 1 6.23-4.98c3.67-2.9 6.55-5.12 9.07-6.95 4.37-3.19 9.16-10.56 13.29-19.4v66.9zm0-116.23c-.62.01-1.27.06-1.95.13-6.13.63-13.83 3.45-21.83 7.45-3.64 1.82-8.46 2.67-14.17 2.71-4.7.04-9.72-.47-14.73-1.33-1.7-.3-3.26-.61-4.67-.93a31.55 31.55 0 0 0-3.55-.57 273.4 273.4 0 0 0-16.66-.88c-10.42-.16-17.2.74-17.97 2.73-.38.97.6 2.55 3.03 4.87 1.01.97 2.22 2.03 4.04 3.55a1746.07 1746.07 0 0 0 4.79 4.02c1.39 1.2 3.1 1.92 5.5 2.5.7.16.86.2 2.64.54 3.53.7 5.03 1.25 6.15 2.63 1.41 1.76 1.4 4.54-.15 8.88-2.44 6.83-5.72 10.05-10.19 10.33-3.63.23-7.6-1.29-14.52-5.06-4.53-2.47-6.82-7.3-8.32-15.26-.17-.87-.32-1.78-.5-2.86l-.43-2.76c-1.05-6.58-1.9-9.2-3.73-10.11-.81-.4-1.59-.74-2.36-1-2.27-.77-4.6-1.02-8.1-.92-2.29.07-14.7 1-13.77.93-20.55 1.37-28.8 5.05-37.09 14.99a133.07 133.07 0 0 0-4.25 5.44l-2.3 3.09-2.51 3.32c-4.1 5.36-7.06 8.48-10.39 11.12-.65.52-1.33 1.04-2.13 1.62l-4.11 2.94a106.8 106.8 0 0 0-5.16 3.99c-4.55 3.74-9.74 8.6-16.25 15.38-8.25 8.58-11.78 13.54-11.7 15.95.07 1.65 1.64 2.11 6.79 2.38 1.61.09 2.15.12 2.98.2 2.95.24 5.09.73 6.81 1.68 7.48 4.15 11.63 7.26 13.95 11.58 3.3 6.15.8 12.88-8.89 20.26-8.28 6.3-11.1 10.37-11.31 14.96-.06 1.17 0 1.93.26 4.43.69 6.47.25 10.65-2.8 17.42a44.23 44.23 0 0 1-4.16 7.53c-2.82 3.97-5.47 5.74-10.6 7.69-.43.16-3.34 1.23-4.27 1.59-1.8.68-3.38 1.36-5.01 2.14-4.18 2-8.4 4.6-13.1 8.24-8.44 6.51-13.23 14.56-15.98 25.06-1.1 4.2-1.55 6.81-2.8 15.21-1.26 8.6-2.17 12.64-4.08 16.55-2.1 4.28-11.93 26.59-12.97 28.88a382.7 382.7 0 0 1-6.37 13.41c-4.07 8.11-7.61 14.07-10.73 17.81-5.38 6.46-8.98 14.37-13.77 28.42a810.14 810.14 0 0 0-1.89 5.6c-1.8 5.35-2.96 8.6-4.26 11.85-6.13 15.32-25.43 26.31-46.46 26.31-11.2 0-20.58-2.74-31.02-8.55-5.6-3.13-4.55-2.42-22.26-14.54-14.33-9.8-17.7-10.73-20.47-6.9-.37.5-1.81 2.74-1.83 2.77a52.24 52.24 0 0 1-4.94 5.9c-.73.79-5.52 5.87-6.97 7.45-2.38 2.6-4.3 4.81-5.98 6.93a45.6 45.6 0 0 0-5.08 7.66c-1.29 2.57-1.9 5.25-2.66 10.6a997.6 997.6 0 0 1-.46 3.18h-1l.47-3.32c.77-5.45 1.4-8.2 2.75-10.9a46.54 46.54 0 0 1 5.2-7.84c1.7-2.14 3.63-4.38 6.03-6.98 1.45-1.59 6.24-6.68 6.96-7.46a51.58 51.58 0 0 0 4.84-5.78s1.47-2.26 1.86-2.8c3.25-4.5 7.08-3.44 21.84 6.67 17.67 12.08 16.62 11.38 22.19 14.48 10.3 5.73 19.5 8.43 30.53 8.43 20.65 0 39.57-10.77 45.54-25.69a219.7 219.7 0 0 0 4.24-11.8 6752.32 6752.32 0 0 0 1.88-5.6c4.83-14.16 8.47-22.14 13.96-28.73 3.05-3.66 6.56-9.57 10.6-17.61 1.97-3.93 4.04-8.31 6.35-13.38 1.03-2.28 10.88-24.61 12.98-28.91 1.85-3.79 2.75-7.76 4-16.25 1.24-8.44 1.7-11.07 2.81-15.32 2.8-10.7 7.71-18.94 16.33-25.6a73.18 73.18 0 0 1 13.29-8.35c1.66-.8 3.27-1.48 5.08-2.18.94-.36 3.86-1.43 4.28-1.59 4.95-1.88 7.44-3.55 10.14-7.33 1.35-1.9 2.68-4.3 4.06-7.37 2.97-6.58 3.39-10.59 2.72-16.9a27.13 27.13 0 0 1-.27-4.58c.22-4.94 3.21-9.24 11.7-15.7 9.33-7.11 11.66-13.34 8.62-19-2.2-4.09-6.25-7.12-13.55-11.17-1.57-.88-3.6-1.33-6.42-1.57-.8-.07-1.34-.1-2.95-.19-5.77-.3-7.63-.85-7.72-3.34-.1-2.81 3.5-7.87 11.97-16.69 6.53-6.8 11.75-11.69 16.33-15.45 1.79-1.47 3.42-2.72 5.2-4.03l4.12-2.94c.79-.58 1.46-1.08 2.1-1.59 3.26-2.6 6.16-5.65 10.21-10.94a383.2 383.2 0 0 0 2.5-3.32l2.31-3.09c1.8-2.39 3.04-4 4.29-5.48 8.47-10.17 16.98-13.96 37.27-15.3-.44.02 12-.9 14.32-.98 3.62-.1 6.05.16 8.46.98.8.27 1.62.62 2.47 1.04 2.27 1.14 3.17 3.87 4.27 10.85l.44 2.76c.17 1.07.33 1.97.5 2.83 1.44 7.69 3.62 12.29 7.8 14.57 6.76 3.68 10.6 5.15 13.99 4.94 4-.25 6.99-3.17 9.3-9.67 1.45-4.04 1.46-6.49.32-7.92-.9-1.12-2.28-1.62-5.57-2.27a55.8 55.8 0 0 1-2.67-.55c-2.54-.6-4.39-1.4-5.93-2.71a252.63 252.63 0 0 0-4.78-4.01 84.35 84.35 0 0 1-4.08-3.6c-2.73-2.6-3.86-4.43-3.28-5.95 1.02-2.64 7.82-3.54 18.93-3.37a230.56 230.56 0 0 1 16.73.88c2.76.39 3.2.49 3.68.6 1.4.3 2.95.62 4.62.91a82.9 82.9 0 0 0 14.56 1.32c5.56-.04 10.24-.86 13.73-2.6 8.1-4.05 15.89-6.9 22.17-7.56.7-.07 1.4-.11 2.05-.13v1zm0-100.94v1.5c-8.62 16.05-17.27 29.55-23.65 35.92-3.19 3.2-7.62 4.9-13.54 5.56-4.45.48-8.28.4-19.18-.2-9.91-.55-15.32-.44-20.52.78a84.05 84.05 0 0 1-15 2.11l-2.25.14c-12.49.75-19.37 1.78-32.72 5.74-4.5 1.33-9.27 2.49-14.3 3.48a246.27 246.27 0 0 1-32.6 3.97c-7.56.45-13.21.57-20.24.57-5.4 0-11.9 1.61-18 5.18-8.3 4.87-15.06 12.87-19.53 24.5a68.57 68.57 0 0 1-4.56 9.8c-3.6 6.2-6.92 8.99-13.38 12.18l-4.03 1.96a64.48 64.48 0 0 0-15.16 10.25c-8.2 7.33-13.72 16.63-22.54 35.6l-2.08 4.49c-7.3 15.7-11.5 23.3-17.35 29.87-7.7 8.66-20.25 14.42-40.31 20.08-4.37 1.23-19.04 5.08-19.24 5.13-6.92 1.87-11.68 3.34-15.63 4.92-10.55 4.22-18.71 10.52-36.38 26.52l-1.7 1.54c-8.58 7.76-13.41 11.9-18.81 15.88-3.95 2.9-8 5.67-12.97 8.91-2.06 1.34-10.3 6.6-12.33 7.94-11.52 7.5-18.53 13.04-24.62 20.08a62.01 62.01 0 0 0-6.44 8.85c-4.13 6.91-6.27 13.15-9.2 25.11l-1.54 6.26c-.6 2.45-1.15 4.54-1.72 6.58-2.97 10.7-6.9 17.36-14.78 26.91L69.6 491a148.51 148.51 0 0 0-4.19 5.3 23.9 23.9 0 0 0-3.44 6.28c-1.16 3.23-1.52 5.9-1.87 11.94-.58 10.05-1.42 15.04-4.63 22.67-1.57 3.72-5.66 14.02-6.41 15.8a73.46 73.46 0 0 1-3.57 7.4c-2.88 5.14-6.71 10.12-13.12 16.95-5.96 6.36-8.87 10.9-10.61 16a56.88 56.88 0 0 0-1.38 4.82l-.46 1.84h-1.03l.52-2.08c.52-2.09.92-3.49 1.4-4.9 1.8-5.25 4.78-9.9 10.84-16.36 6.35-6.78 10.13-11.7 12.97-16.77a72.5 72.5 0 0 0 3.52-7.29c.75-1.76 4.84-12.06 6.4-15.8 3.17-7.5 3.99-12.4 4.56-22.33.35-6.14.72-8.88 1.93-12.23a24.9 24.9 0 0 1 3.58-6.54c1.27-1.7 2.6-3.37 4.22-5.34l4.11-4.95c7.8-9.46 11.66-16 14.59-26.54.56-2.04 1.1-4.12 1.71-6.56l1.53-6.26c2.96-12.04 5.13-18.36 9.32-25.39 1.84-3.08 4-6.05 6.54-8.99 6.17-7.12 13.24-12.7 24.83-20.26 2.05-1.33 10.28-6.6 12.33-7.94 4.96-3.22 9-5.98 12.92-8.87 5.37-3.95 10.19-8.08 18.74-15.82l1.7-1.54c17.76-16.09 25.98-22.43 36.67-26.7 4-1.6 8.8-3.09 15.75-4.96.21-.06 14.87-3.9 19.22-5.13 19.9-5.61 32.32-11.31 39.85-19.78 5.76-6.48 9.93-14.02 17.18-29.64l2.09-4.5c8.87-19.07 14.44-28.46 22.77-35.9a65.48 65.48 0 0 1 15.38-10.4l4.04-1.97c6.3-3.1 9.47-5.77 12.96-11.77a67.6 67.6 0 0 0 4.48-9.67c4.56-11.84 11.47-20.02 19.97-25 6.25-3.66 12.93-5.32 18.5-5.32 7.01 0 12.65-.12 20.17-.57a245.3 245.3 0 0 0 32.47-3.96c5-.98 9.75-2.13 14.22-3.45 13.43-3.98 20.38-5.02 32.94-5.78l2.24-.14c5.76-.37 9.8-.9 14.85-2.09 5.31-1.25 10.79-1.35 22.6-.7 9.04.5 12.84.58 17.21.1 5.71-.62 9.94-2.26 12.95-5.26 6.44-6.45 15.3-20.37 24.35-36.72zm0 450.21c-1.28-4.6-2.2-10.55-3.33-20.25l-.24-2.04-.23-2.03c-1.82-15.7-3.07-21.98-5.55-24.47-2.46-2.46-3.04-5.03-2.52-8.64.1-.6.18-1.1.39-2.15.69-3.54.77-5.04.08-6.84-.91-2.38-3.31-4.41-7.79-6.26-5.08-2.09-6.52-4.84-4.89-8.44.66-1.45 1.79-3.02 3.52-5.01 1.04-1.2 5.48-5.96 5.08-5.53 6.15-6.7 8.98-11.34 8.98-16.48a15.2 15.2 0 0 1 6.5-12.89v1.26a14.17 14.17 0 0 0-5.5 11.63c0 5.47-2.93 10.29-9.24 17.16.38-.42-4.04 4.33-5.07 5.5-1.67 1.93-2.75 3.43-3.36 4.77-1.37 3.04-.23 5.22 4.36 7.1 4.71 1.95 7.32 4.16 8.34 6.83.78 2.04.7 3.67-.03 7.4-.2 1.03-.3 1.51-.38 2.09-.48 3.33.03 5.59 2.23 7.8 2.74 2.74 3.98 8.96 5.84 25.06l.24 2.03.23 2.04c.82 7.01 1.53 12.06 2.34 16.03v4.33zm0-62.16c-1.4-3.13-4.43-9.9-4.95-11.17-1.02-2.53-1.25-3.8-.91-5.18.2-.84 2.05-4.68 2.32-5.33a70.79 70.79 0 0 0 3.54-11.2v3.99a62.82 62.82 0 0 1-2.62 7.6c-.31.75-2.09 4.46-2.27 5.18-.28 1.12-.08 2.22.87 4.57.41 1.02 2.5 5.7 4.02 9.09v2.45zm0-85.09c-1.65 1.66-3.66 2.9-6.4 4.13-.25.1-13.97 5.47-20.4 8.43-9.35 4.32-16.7 5.9-23.03 5.25-5.08-.53-9.02-2.25-14.77-5.92l-3.2-2.07a77.4 77.4 0 0 0-5.44-3.27c-4.05-2.18-3.25-5.8 1.47-10.47 3.71-3.68 9.6-7.93 18.73-13.8l4.46-2.82c17.95-11.33 18.22-11.5 22.27-14.74 11.25-9 19.69-14.02 26.31-15.1v1.02c-6.37 1.1-14.62 6-25.69 14.86-4.1 3.28-4.34 3.44-22.36 14.8a652.4 652.4 0 0 0-4.45 2.83c-9.07 5.83-14.92 10.05-18.57 13.66-4.31 4.28-4.95 7.13-1.7 8.88 1.7.91 3.29 1.88 5.5 3.3l3.2 2.08c5.64 3.59 9.45 5.25 14.34 5.76 6.13.64 13.32-.9 22.52-5.15 6.46-2.98 20.18-8.35 20.4-8.44 3.04-1.37 5.1-2.71 6.81-4.69v1.47zm0-41.37v1c-6.56.26-12.11 3.13-19.71 9.08l-4.63 3.68a51.87 51.87 0 0 1-4.4 3.14c-.82.52-5.51 3.33-6.22 3.76-3.31 2-6.15 3.8-8.87 5.6a112.61 112.61 0 0 0-8.16 5.92c-4.61 3.72-7.4 6.9-7.97 9.35-.63 2.67 1.48 4.53 7.05 5.46 10.7 1.78 20.92-.05 30.45-4.65a61.96 61.96 0 0 0 17.1-12.2 41.8 41.8 0 0 0 5.36-7.42v1.92a38.94 38.94 0 0 1-4.64 6.19 62.95 62.95 0 0 1-17.39 12.41c-9.7 4.68-20.13 6.55-31.05 4.73-6.06-1-8.65-3.29-7.85-6.67.64-2.74 3.53-6.05 8.31-9.9 2.35-1.9 5.1-3.88 8.24-5.97 2.73-1.82 5.58-3.61 8.9-5.62.72-.44 5.4-3.24 6.22-3.75 1.26-.8 2.6-1.76 4.3-3.09.8-.62 3.9-3.1 4.63-3.67 7.77-6.1 13.49-9.04 20.33-9.3zm0-154.6v1c-1.75-.24-4.3.23-7.82 1.55-10.01 3.75-13.8 5.07-19.15 6.76-1.78.56-2.63.83-3.87 1.24-1.48.5-3.16.76-6.74 1.16a1550.34 1550.34 0 0 0-2.64.3c-7.8.94-11.28 2.47-11.28 6.07 0 4.45 2.89 13.18 7.96 25.81a57.34 57.34 0 0 1 2.33 7.6 258.32 258.32 0 0 1 .84 3.46c1.86 7.62 3.17 10.71 5.56 11.67 2.21.88 4.7.6 7.47-.72 3.48-1.69 7.22-4.94 11.2-9.47 1.52-1.7 2.97-3.49 4.59-5.57l3.16-4.1c2.59-3.23 6.07-12.21 8.39-20.23v3.45c-2.29 7.2-5.27 14.5-7.61 17.41-.44.55-2.67 3.46-3.15 4.09-1.63 2.1-3.1 3.9-4.62 5.62-4.08 4.61-7.9 7.94-11.53 9.7-2.99 1.44-5.77 1.75-8.28.74-2.84-1.13-4.2-4.34-6.15-12.35a2097.48 2097.48 0 0 1-.84-3.46c-.8-3.2-1.47-5.45-2.28-7.46-5.14-12.8-8.04-21.55-8.04-26.19 0-4.37 3.84-6.06 12.16-7.07a160.9 160.9 0 0 1 2.65-.3c3.5-.39 5.15-.64 6.53-1.1 1.26-.42 2.1-.7 3.88-1.26 5.34-1.68 9.11-3 19.1-6.74 3.53-1.32 6.22-1.84 8.18-1.61zM0 292c10.13-11.31 18.13-23.2 23.07-35.39 3.3-8.14 6.09-16.12 10.81-30.55l1.59-4.84c6.53-19.94 10.11-29.82 14.77-39.56 6.07-12.72 12.55-21.18 20.27-25.54 6.66-3.76 10.2-7.86 12.22-13.15a46.6 46.6 0 0 0 1.86-6.58c1.23-5.2 2.05-7.59 3.93-10.36 2.45-3.62 6.27-6.53 12.1-8.96 15.78-6.58 16.73-7.04 18.05-9.01.65-.98.83-2.15.74-4.51-.03-.73-.23-3.82-.24-4A93.8 93.8 0 0 1 119 94c0-10.04.18-11.37 2.37-13.15.52-.42 1.13-.8 2.07-1.3.27-.14 2.18-1.12 2.84-1.48a68.4 68.4 0 0 0 9.12-5.87c2.06-1.54 2.64-2.14 8.01-7.93 3.78-4.09 6.21-6.36 8.96-8.12 3.64-2.33 7.2-3.12 10.9-2.11 4.4 1.2 10.81 2 18.78 2.46 6.9.4 12.9.5 21.95.5 4.87 0 8.97.47 15.4 1.57 7.77 1.33 9.3 1.54 12.38 1.54 4.05 0 7.43-.88 10.68-2.95 5.06-3.22 8.11-4.67 11.2-5.2 3.62-.64 4.77-.46 16.55 2.06 17.26 3.7 30.85 1.36 41.06-9.7 5.1-5.53 5.48-8.9 3.48-14.8-.83-2.42-1.03-3.1-1.17-4.3-.29-2.52.5-4.71 2.71-6.93 2.65-2.65 4.72-9.17 6.22-18.29h2.03c-1.56 9.71-3.77 16.65-6.83 19.7-1.79 1.8-2.36 3.39-2.14 5.28.11 1 .3 1.63 1.07 3.9 2.22 6.53 1.76 10.66-3.9 16.8-10.77 11.66-25.07 14.13-42.95 10.3-11.42-2.45-12.55-2.62-15.78-2.06-2.77.48-5.62 1.84-10.47 4.92a20.93 20.93 0 0 1-11.76 3.27c-3.25 0-4.81-.22-12.73-1.57C212.74 59.46 208.73 59 204 59c-9.1 0-15.11-.1-22.07-.5-8.09-.47-14.62-1.29-19.2-2.54-5.62-1.53-10.17 1.38-17.85 9.66-5.5 5.94-6.08 6.53-8.28 8.18a70.38 70.38 0 0 1-9.38 6.03c-.68.37-2.58 1.35-2.84 1.49-.84.44-1.35.76-1.75 1.08C121.16 83.6 121 84.8 121 94c0 1.85.06 3.54.17 5.44 0 .17.2 3.28.24 4.03.1 2.75-.13 4.29-1.08 5.71-1.67 2.5-2.27 2.8-18.95 9.74-5.48 2.29-8.99 4.96-11.2 8.24-1.71 2.51-2.47 4.73-3.64 9.7-.83 3.5-1.21 4.92-1.94 6.83-2.18 5.73-6.05 10.19-13.1 14.18-7.3 4.12-13.55 12.28-19.46 24.66-4.6 9.64-8.17 19.46-14.67 39.32l-1.58 4.84c-4.75 14.47-7.54 22.48-10.86 30.69-5.28 13.01-13.95 25.65-24.93 37.6v-2.97zm0 78v-.5l1-.01c6.32 0 7.47 5.2 4.6 13.36a60.36 60.36 0 0 1-5.6 11.3v-1.92a57.76 57.76 0 0 0 4.65-9.72c2.69-7.6 1.71-12.02-3.65-12.02-.34 0-.67 0-1 .02v-46.59a340.96 340.96 0 0 0 13.71-8.34c13.66-9.46 29.79-37.6 29.79-53.59 0-18.1 21.57-72.64 32.23-79.42 12.71-8.09 32.24-27.96 35.8-37.75 1.93-5.3 5.5-7.27 14.42-9.37 6.15-1.44 8.64-2.42 10.67-4.79 1.5-1.74 2.72-4.79 4.33-10.3.23-.78 1.9-6.68 2.43-8.46 3.62-12.08 7.3-18.49 13.47-20.39 2.5-.76 3.03-.98 9.74-3.7 7.49-3.03 11.97-4.43 17.12-4.92 6.75-.65 13.13.75 19.55 4.67 5.43 3.32 12.19 4.72 20.17 4.56 6.03-.12 12.2-1.07 19.83-2.8 1.82-.4 7.38-1.74 8.26-1.94 2.69-.6 4.34-.89 5.48-.89 4.97 0 8.93-.05 14.2-.27 7.9-.32 15.56-.92 22.75-1.88 8.5-1.14 15.9-2.73 21.88-4.82 18.9-6.62 32.64-18.3 33.67-27.59.29-2.56.4-2.96 2.79-11.11 2.33-7.95 3.21-12.93 2.72-18.23-.2-2.24-.69-4.38-1.48-6.42-1.5-3.92-2.63-9.4-3.43-16.18h.9c.77 6.47 1.89 11.72 3.47 15.82a24.93 24.93 0 0 1 1.54 6.69c.5 5.46-.4 10.54-2.77 18.6-2.36 8.06-2.47 8.47-2.74 10.95-1.09 9.75-15.1 21.68-34.33 28.41-6.06 2.12-13.52 3.72-22.09 4.87-7.22.96-14.92 1.57-22.83 1.89-5.3.21-9.27.27-14.25.27-1.04 0-2.64.27-5.26.87-.87.2-6.43 1.53-8.26 1.94-7.68 1.73-13.92 2.7-20.03 2.82-8.15.17-15.1-1.27-20.71-4.7-6.23-3.81-12.4-5.16-18.93-4.54-5.04.48-9.44 1.86-16.84 4.86-6.75 2.74-7.29 2.95-9.82 3.73-5.73 1.76-9.28 7.96-12.81 19.72-.53 1.77-2.2 7.66-2.43 8.46-1.66 5.65-2.91 8.78-4.53 10.67-2.22 2.58-4.84 3.62-12.01 5.3-7.8 1.83-11.13 3.66-12.9 8.54-3.65 10.04-23.32 30.06-36.2 38.25C65.94 190 44.5 244.2 44.5 262c0 16.34-16.3 44.78-30.22 54.41-2.14 1.48-8.24 5.12-14.28 8.68v-1.16 46.09zm0-173.7v-1.11c7.42-3.82 14.55-10.23 21.84-18.98 3.8-4.56 14.21-18.78 15.79-20.55 1.8-2.04 4.06-3.96 7.42-6.45 1.08-.8 4.92-3.57 5.49-3.99 9.36-6.85 14-11.96 15.98-19.36.8-2.98 1.54-6.78 2.46-12.3.23-1.44 2-12.46 2.56-15.79 2.87-16.77 5.73-26.79 10.07-32.1C92.46 52.43 101.5 38.13 101.5 33c0-2.54.34-3.35 6.05-15.71.68-1.49 1.25-2.74 1.77-3.93 2.5-5.75 3.9-10.04 4.14-13.36h1c-.23 3.48-1.66 7.87-4.23 13.76-.52 1.2-1.09 2.45-1.78 3.95-5.54 12.01-5.95 12.99-5.95 15.29 0 5.47-9.09 19.84-20.11 33.31-4.2 5.12-7.03 15.06-9.86 31.64-.57 3.33-2.33 14.33-2.57 15.78-.92 5.56-1.67 9.38-2.48 12.4-2.05 7.68-6.82 12.93-16.35 19.91l-5.49 3.98c-3.3 2.45-5.51 4.34-7.27 6.31-1.53 1.73-11.94 15.93-15.76 20.53-7.52 9.02-14.88 15.6-22.61 19.46zm0 361.83v-4.33c.48 2.36 1 4.35 1.6 6.15 2 6.03 4.6 8.26 8.19 6.59C28.76 557.69 43.5 542.4 43.5 527c0-16.2 6.37-31.99 17.1-46.3 1.88-2.5 3.66-4.4 5.53-6 .73-.62 1.45-1.18 2.3-1.8l2-1.43c3.68-2.68 5.32-5.28 7.08-12.59.75-3.07 1.38-5.02 4.2-13.26l.63-1.88c3.24-9.58 4.56-14.97 4.17-18.65-.48-4.43-3.8-5.23-11.3-1.64a81.12 81.12 0 0 1-9.15 3.7c-13.89 4.67-26.96 5.8-42.66 5.42l-1.95-.05-1.45-.02a39.8 39.8 0 0 0-15.05 2.96A21.81 21.81 0 0 0 0 438.37v-1.26a23.55 23.55 0 0 1 4.55-2.57 40.77 40.77 0 0 1 16.92-3.02l1.95.05c15.6.38 28.57-.75 42.32-5.37a80.12 80.12 0 0 0 9.04-3.65c8.04-3.84 12.16-2.85 12.72 2.43.42 3.89-.92 9.34-4.21 19.08l-.64 1.88c-2.8 8.2-3.43 10.15-4.16 13.18-1.82 7.52-3.59 10.34-7.47 13.16l-2 1.43c-.84.6-1.54 1.15-2.25 1.75a35.45 35.45 0 0 0-5.37 5.84c-10.61 14.15-16.9 29.74-16.9 45.7 0 15.88-15 31.45-34.29 40.45-4.3 2.01-7.39-.66-9.56-7.18-.23-.68-.44-1.39-.65-2.13zm0-62.16v-2.45l1.46 3.27c2.1 4.8 3.46 10.33 4.26 16.77.66 5.3.84 9.3 1.04 18.5.2 9.32.5 12.75 1.63 15.05 1.28 2.6 3.67 2.35 8.29-1.5 17.14-14.3 21.82-22.9 21.82-38.62 0-7.17 1.1-12.39 3.7-17.68 2.27-4.67 3.65-6.62 13.4-19.62a69.8 69.8 0 0 1 7.6-8.79 44.76 44.76 0 0 1 3.54-3.06c.38-.3.64-.52.89-.74a10.47 10.47 0 0 0 2.63-3.32 35.78 35.78 0 0 0 2.26-5.94l.37-1.2.36-1.15c.29-.91.48-1.55.66-2.16.45-1.53.74-2.68.91-3.66.38-2.2.12-3.49-.85-4.15-2.35-1.61-9.28-.24-23.8 4.94-9.54 3.4-16.12 4.17-27.85 4.26-7.71.06-10.43.4-13.25 2.12-3.48 2.12-5.84 6.4-7.58 14.26-.5 2.2-.99 4.19-1.49 5.98v-3.98l.51-2.22c1.8-8.1 4.28-12.6 8.04-14.9 3.04-1.85 5.86-2.2 13.77-2.26 11.61-.09 18.1-.84 27.51-4.2 14.93-5.32 21.95-6.71 24.7-4.83 1.38.94 1.71 2.6 1.28 5.15a33.69 33.69 0 0 1-.94 3.78l-.66 2.17-.36 1.15-.37 1.2a36.64 36.64 0 0 1-2.33 6.1c-.8 1.53-1.61 2.52-2.86 3.61l-.92.77-1.02.83c-.9.74-1.65 1.4-2.47 2.18a68.84 68.84 0 0 0-7.48 8.66c-9.7 12.93-11.07 14.87-13.31 19.46-2.52 5.15-3.59 10.22-3.59 17.24 0 16.04-4.82 24.91-22.18 39.38-5.04 4.2-8.18 4.55-9.83 1.18-1.22-2.5-1.52-5.94-1.73-15.47-.2-9.16-.38-13.15-1.03-18.4-.79-6.34-2.12-11.8-4.19-16.49L0 495.98zM379.27 0h1.04l1.5 5.26c3.28 11.56 4.89 19.33 5.26 27.8.49 11.01-1.52 21.26-6.63 31.17-7.8 15.13-20.47 26.5-36.22 34.1-12.38 5.96-26.12 9.17-36.22 9.17-6.84 0-17.24 1.38-37.27 4.62l-2.27.37c-24.5 3.99-31.65 5-37.46 5-3.49 0-4.08-.08-19.54-2.8-3.56-.64-6.32-1.1-9-1.5-20.23-2.96-31-1.2-31.96 7.86-.1.85-.18 1.72-.29 2.81l-.27 2.73c-1.1 10.9-2.02 15.73-4.31 19.96-2.9 5.34-7.77 7.95-15.63 7.95-10.2 0-12.92.6-15.5 3.17.52-.51-5.03 5.85-8.16 8.7-2.75 2.5-14.32 12.55-15.77 13.83a341.27 341.27 0 0 0-6.54 5.92c-6.97 6.49-11.81 11.76-14.6 16.15-5.92 9.3-10.48 18.04-11.69 24.08-1.66 8.3 3.67 9.54 19.02 1.21a626.23 626.23 0 0 1 44.54-21.9c3.5-1.56 14.04-6.2 15.68-6.95 5.05-2.25 8.3-3.8 10.78-5.15l1.95-1.07 2.18-1.18c1.76-.94 3.38-1.76 5-2.55 18.1-8.72 34.48-10.46 50.33-1.2 22.89 13.34 38.28 37.02 38.28 56.44 0 19.12-.73 25.13-5.18 33.2a45.32 45.32 0 0 1-4.94 7.12c-6.47 7.77-11.81 16.2-12.76 21.27-1.2 6.34 4.69 7.03 20.17-.05 13.31-6.08 22.4-14.95 28.5-26.32a80.51 80.51 0 0 0 6.1-15.13c.9-2.98 3.17-11.65 3.41-12.48a29.02 29.02 0 0 1 1.75-4.83c7.47-14.93 21.09-30.5 36.25-37.24 7.61-3.38 13-9.65 19.4-20.79.84-1.48 4.26-7.64 5.14-9.17 3.52-6.1 6.22-9.7 9.37-11.98 10.15-7.4 28.7-11.1 50.29-11.1 7.52 0 16.54-1.24 27.51-3.58a420.1 420.1 0 0 0 14.96-3.52c-1.3.33 15.54-3.98 19.42-4.89 14.15-3.33 41.07-5.01 64.11-5.01 17.36 0 27.82-9.23 38.53-38.67 6.62-18.21 6.62-26.37 2.69-34.35l-1.18-2.37A13.36 13.36 0 0 1 587.5 58c0-4.03 0-4.01 2.5-24.56.46-3.73.8-6.74 1.12-9.64.9-8.45 1.38-15.2 1.38-20.8 0-.94-.02-1.94-.04-3h1c.03 1.06.04 2.06.04 3 0 5.65-.48 12.43-1.39 20.9-.3 2.91-.66 5.93-1.11 9.66-2.5 20.45-2.5 20.47-2.5 24.44 0 1.97.45 3.57 1.45 5.68.24.51 1.16 2.35 1.17 2.36 4.06 8.24 4.06 16.68-2.65 35.13-10.84 29.8-21.63 39.33-39.47 39.33-22.96 0-49.83 1.68-63.89 4.99-3.86.9-20.69 5.2-19.4 4.88a421.05 421.05 0 0 1-14.99 3.53c-11.04 2.35-20.11 3.6-27.72 3.6-21.4 0-39.76 3.67-49.7 10.9-3 2.19-5.64 5.7-9.1 11.68-.87 1.52-4.29 7.68-5.14 9.17-6.49 11.3-12 17.71-19.86 21.2-14.9 6.63-28.38 22.03-35.75 36.77a28.17 28.17 0 0 0-1.69 4.67c-.23.8-2.5 9.49-3.4 12.5a81.48 81.48 0 0 1-6.19 15.3c-6.2 11.56-15.44 20.58-28.96 26.76-16.1 7.36-23 6.55-21.58-1.04 1-5.29 6.4-13.83 12.99-21.73a44.33 44.33 0 0 0 4.82-6.96c4.35-7.88 5.06-13.77 5.06-32.72 0-19.04-15.19-42.4-37.72-55.55-15.57-9.08-31.62-7.38-49.45 1.21a132.9 132.9 0 0 0-7.14 3.71l-1.95 1.07a158.83 158.83 0 0 1-10.85 5.19c-1.65.74-12.18 5.38-15.69 6.95a625.25 625.25 0 0 0-44.46 21.86c-15.95 8.66-22.37 7.16-20.48-2.29 1.24-6.2 5.83-15.02 11.82-24.42 2.85-4.48 7.74-9.8 14.77-16.34 1.98-1.85 4.12-3.79 6.56-5.94 1.46-1.29 13.02-11.33 15.75-13.82 3.09-2.8 8.6-9.14 8.14-8.67 2.82-2.82 5.75-3.46 16.2-3.46 7.5 0 12.04-2.43 14.75-7.42 2.2-4.07 3.11-8.84 4.2-19.59l.26-2.73.3-2.81c.56-5.42 4.47-8.5 11.23-9.6 5.44-.88 12.51-.51 21.86.86 2.7.4 5.47.86 9.04 1.49 15.33 2.7 15.96 2.8 19.36 2.8 5.73 0 12.9-1.03 37.3-5l2.27-.36c20.1-3.26 30.52-4.64 37.43-4.64 9.95 0 23.54-3.18 35.78-9.08 15.57-7.5 28.09-18.73 35.78-33.65 5.02-9.75 7-19.82 6.51-30.67-.37-8.37-1.96-16.08-5.23-27.57L379.27 0zm13.68 0h1.02c.78 3.9 1.92 8.7 3.51 14.88 3.63 14.05 3.06 27.03-.75 38.77a61 61 0 0 1-11.35 20.68 138.36 138.36 0 0 1-19.32 18.77c-11.32 9.02-23.36 15.49-35.95 18.39a258.63 258.63 0 0 1-22.57 4.07c-3.17.44-6.36.85-10.3 1.32l-9.39 1.12c-11.53 1.41-17.45 2.55-21.64 4.46-9.28 4.21-28.35 6.04-49.21 6.04-1.37 0-2.8-.12-4.3-.35-2.62-.41-5-1.03-9.14-2.29-7.34-2.21-9.63-2.75-12.63-2.56-3.9.23-6.63 2.29-8.47 6.89-1.86 4.66-2.42 7.53-3.34 14.98-1.1 8.98-2.87 12.12-9.97 14.3a40.12 40.12 0 0 0-6.8 2.66c-.63.33-1.16.64-1.76 1.02l-1.34.86c-1.9 1.14-3.86 1.49-9.25 1.49-3.2 0-8.83-.55-9.51-.39-1.22.28-.75-.14-7.14 6.24-1.5 1.5-3.49 3.18-6.32 5.37-1.52 1.18-7.16 5.43-7.94 6.03-4.96 3.78-8.33 6.6-11.06 9.38-4.88 4.98-6.85 9.15-5.56 12.7 1.34 3.67 4.07 4.42 8.9 2.82a55.72 55.72 0 0 0 7.77-3.48c1.5-.77 7.78-4.13 9.37-4.96a116.8 116.8 0 0 1 12.31-5.68 162.2 162.2 0 0 0 11.04-4.84c2.04-.97 10.74-5.16 13-6.22 4.41-2.1 8.1-3.78 11.65-5.29 17.14-7.3 29.32-9.9 37.67-6.65l5.43 2.1c2.3.88 4.17 1.62 6.02 2.38a150.9 150.9 0 0 1 13.07 6c18.34 9.63 30.35 22.13 34.79 39.87 6.96 27.85 3.6 45.53-8.08 62.4-3.97 5.75-3.52 9.2.06 8.97 4.14-.28 10.21-4.95 15.11-12.52 3.1-4.8 5.1-10.45 8.05-21.53l1.69-6.35c.66-2.47 1.24-4.52 1.83-6.5 4.93-16.56 11-27.28 21.56-34.76 7.15-5.06 23.73-15.5 25.48-16.75 6.74-4.81 10.53-9.44 14.34-18 7.74-17.44 21.09-24.34 44.47-24.34 9.36 0 17.91-1.13 29.53-3.49a624.86 624.86 0 0 0 6.2-1.28c2.4-.5 4.07-.84 5.66-1.13 4.03-.74 7.04-1.1 9.61-1.1 4.44 0 9.39-1 31.39-5.99l2.95-.66c16.34-3.67 25.64-5.35 31.66-5.35 1.54 0 2.4.01 6.4.1 7.8.15 12.27.13 17.33-.2 16.41-1.06 26.73-5.36 29.8-14.56a87.1 87.1 0 0 1 3.55-8.83c-.15.31 2.29-4.96 2.9-6.38 5.38-12.3 5.57-21.92-1.44-39.44a86.4 86.4 0 0 1-5.26-20.72c-1.61-11.98-1.38-23.14.1-40.35l.2-2.12h1l-.2 2.2c-1.48 17.15-1.7 28.24-.11 40.14a85.4 85.4 0 0 0 5.2 20.47c7.1 17.78 6.91 27.67 1.43 40.22-.62 1.43-3.06 6.72-2.91 6.4a86.17 86.17 0 0 0-3.52 8.73c-3.23 9.72-13.9 14.15-30.68 15.24-5.1.33-9.58.35-17.42.2-3.98-.09-4.84-.1-6.37-.1-5.91 0-15.18 1.67-31.44 5.32l-2.95.67c-22.16 5.02-27.05 6.01-31.61 6.01-2.5 0-5.45.36-9.43 1.09-1.58.29-3.25.62-5.64 1.11a4894.21 4894.21 0 0 0-6.2 1.29c-11.68 2.37-20.3 3.51-29.73 3.51-23.02 0-36 6.71-43.53 23.66-3.9 8.8-7.82 13.58-14.7 18.5-1.78 1.27-18.36 11.7-25.48 16.75-10.34 7.32-16.3 17.87-21.19 34.23-.58 1.96-1.15 4-1.82 6.47l-1.69 6.35c-2.98 11.18-5 16.9-8.17 21.81-5.05 7.81-11.37 12.68-15.89 12.98-4.7.31-5.3-4.23-.94-10.53 11.52-16.64 14.82-34.03 7.92-61.6-4.35-17.42-16.16-29.72-34.27-39.22-4-2.1-8.2-4-12.99-5.97-1.84-.75-3.7-1.49-6-2.38l-5.43-2.08c-8.03-3.12-20.02-.58-36.92 6.63-3.52 1.5-7.21 3.19-11.61 5.27l-13 6.22c-4.71 2.22-8.16 3.75-11.11 4.88a115.87 115.87 0 0 0-12.21 5.63c-1.58.83-7.86 4.18-9.37 4.96a56.55 56.55 0 0 1-7.9 3.54c-5.3 1.75-8.62.85-10.17-3.43-1.46-4.02.66-8.5 5.8-13.74 2.75-2.82 6.16-5.66 11.15-9.48.79-.6 6.43-4.85 7.94-6.02a66.96 66.96 0 0 0 6.23-5.28c6.74-6.74 6.1-6.16 7.61-6.51.87-.2 6.69.36 9.74.36 5.22 0 7.03-.32 8.74-1.35l1.31-.84c.62-.4 1.18-.72 1.84-1.07a41.07 41.07 0 0 1 6.96-2.72c6.64-2.04 8.22-4.84 9.28-13.47.93-7.53 1.5-10.47 3.4-15.24 1.99-4.95 5.04-7.26 9.34-7.51 3.17-.2 5.5.35 12.97 2.6a63.54 63.54 0 0 0 9.02 2.26c1.45.22 2.83.34 4.14.34 20.71 0 39.7-1.82 48.8-5.96 4.32-1.96 10.29-3.1 21.93-4.53l9.4-1.12c3.92-.48 7.11-.88 10.27-1.32 8.16-1.14 15.4-2.43 22.49-4.06 12.42-2.86 24.33-9.26 35.55-18.2a137.4 137.4 0 0 0 19.18-18.64 60.02 60.02 0 0 0 11.15-20.32c3.76-11.57 4.32-24.36.75-38.23A284.86 284.86 0 0 1 392.95 0zM506.7 0h1.26c-.5.66-.9 1.18-1.17 1.51-3.95 4.96-6.9 7.92-9.82 9.57A10.02 10.02 0 0 1 492 12.5c-2.38 0-4.24.67-6.71 2.21l-2.65 1.71c-4.38 2.8-8.01 4.08-13.64 4.08-5.6 0-9.99-1.26-16.08-4.05a202.63 202.63 0 0 1-2.3-1.06l-2.18-.98c-1.6-.7-2.92-1.17-4.17-1.48a13.42 13.42 0 0 0-3.27-.43c-2.3 0-4.3-.68-11-3.37l-1.56-.62c-5-1.97-8.1-2.82-10.52-2.66-2.93.2-4.42 2.03-4.42 6.15 0 20.76-5.21 50.42-12.15 57.35-7.58 7.59-26.55 23.7-34.06 29.06-13.16 9.4-31.17 20.2-44.11 25.06a106.87 106.87 0 0 1-13.32 4.03c-3.28.78-6.6 1.43-11.25 2.24-.53.1-8.8 1.5-11.5 1.99-4.86.87-9.3 1.74-14 2.76-20.62 4.48-25.07 5.01-38.11 5.01-2.49 0-2.9-.07-14.05-2-2.42-.42-4.31-.73-6.15-1-8.11-1.19-13.83-1.36-17.64-.2-4.54 1.4-5.93 4.65-3.7 10.52 2.02 5.28 4.84 8.61 8.84 10.74 3.26 1.74 6.75 2.6 13.82 3.71 9.42 1.48 10.94 1.75 15.5 2.92a78.2 78.2 0 0 1 18.62 7.37c8.3 4.58 14.58 11.5 19.98 20.89 2.73 4.73 9.46 19.33 10.54 21.19 3.4 5.85 6.26 6.63 10.89 2 4.95-4.94 10.35-8.37 21.13-14.06.47-.25 2.06-1.1 2.12-1.12 7.98-4.21 11.92-6.51 15.87-9.54 5.11-3.9 8.66-8.1 10.77-13.11 8.52-20.24 20.75-33.31 32.46-33.31l5.5.03c10.53.08 17.35.02 24.9-.31 13.66-.62 23.78-2.09 29.39-4.67 5.85-2.7 13.42-5.49 24.18-9.02 3.46-1.14 6.29-2.05 12.7-4.1 7.7-2.45 11.08-3.54 15.17-4.9a1059.43 1059.43 0 0 1 11.33-3.72c3.67-1.2 5.96-2 8.03-2.78a59.88 59.88 0 0 0 6.66-2.94c1.87-.98 3.76-2.1 5.86-3.5 3.48-2.33 6.15-3.13 12.04-4.13l1.15-.2c5.71-1.01 9-2.3 12.76-5.63 7.82-6.96 8.58-23.18 3.84-44.52-1.7-7.67-2.1-19.28-1.57-35.47A837.22 837.22 0 0 1 546.76 0h1l-.15 3.06c-.32 6.42-.53 11.02-.68 15.62-.51 16.1-.12 27.65 1.56 35.21 4.82 21.68 4.04 38.2-4.16 45.48-3.91 3.48-7.37 4.84-13.24 5.87l-1.16.2c-5.76.99-8.32 1.75-11.65 3.98a63.73 63.73 0 0 1-5.96 3.56 60.86 60.86 0 0 1-6.77 2.99c-2.09.79-4.39 1.58-8.07 2.79a5398.31 5398.31 0 0 1-11.32 3.71c-4.1 1.37-7.48 2.46-15.18 4.92-6.42 2.04-9.24 2.95-12.7 4.08-10.73 3.53-18.27 6.3-24.07 8.98-5.76 2.66-15.97 4.14-29.77 4.77-7.56.33-14.4.39-24.95.31l-5.49-.03c-11.19 0-23.16 12.79-31.54 32.7-2.19 5.19-5.84 9.52-11.08 13.52-4.02 3.07-7.99 5.39-16.01 9.62l-2.12 1.12c-10.7 5.65-16.04 9.04-20.9 13.9-5.14 5.14-8.75 4.15-12.45-2.22-1.12-1.92-7.85-16.5-10.54-21.2-5.33-9.24-11.48-16.02-19.6-20.5a77.2 77.2 0 0 0-18.4-7.28c-4.5-1.17-6.02-1.43-15.4-2.9-7.17-1.12-10.74-2-14.13-3.81-4.22-2.25-7.2-5.77-9.3-11.27-2.43-6.39-.78-10.26 4.34-11.83 4-1.22 9.82-1.05 18.08.17 1.84.27 3.74.58 6.17 1 11.02 1.9 11.48 1.98 13.88 1.98 12.96 0 17.35-.52 37.9-4.99 4.71-1.02 9.16-1.9 14.03-2.77 2.71-.48 10.98-1.9 11.5-1.98 4.64-.81 7.95-1.46 11.2-2.23 4.55-1.07 8.76-2.34 13.2-4 12.83-4.81 30.79-15.59 43.88-24.94 7.47-5.33 26.4-21.4 33.94-28.94C407.3 61.98 412.5 32.49 412.5 12c0-4.61 1.86-6.9 5.35-7.15 2.63-.18 5.8.7 10.96 2.73l1.56.62c6.53 2.62 8.53 3.3 10.63 3.3 1.14 0 2.3.16 3.5.46 1.32.33 2.68.82 4.34 1.53a90.97 90.97 0 0 1 3.34 1.52l1.15.54c5.98 2.73 10.23 3.95 15.67 3.95 5.41 0 8.87-1.21 13.1-3.92.2-.13 2.1-1.38 2.66-1.72 2.62-1.63 4.64-2.36 7.24-2.36 1.47 0 2.94-.43 4.47-1.3 2.78-1.56 5.67-4.45 9.54-9.31l.7-.89zM324.54 600h-2.03c.49-2.96.91-6.2 1.28-9.66.44-4.1.76-8.25.98-12.21.08-1.39.14-2.65-.35-7.29-.47-1.94-.93-4.14-1.36-6.54-2.01-11.26-2.66-22.9-1.14-33.78a60.76 60.76 0 0 1 5.18-17.95 70.78 70.78 0 0 1 12.6-18.22c3.38-3.6 5.53-5.5 11.83-10.79 4.5-3.78 6.35-5.56 7.52-7.5.64-1.07.95-2.06.95-3.06 0-1.75 0-1.74-.75-9.23-.36-3.7-.57-6.3-.68-8.96-.5-12.1 1.62-19.6 8.11-21.76 15.9-5.3 25.89-12.1 33.45-25.54C409.6 390.65 425.85 376 436 376c12.36 0 20-1.96 29.41-8.8 6.76-4.92 9.5-6.6 12.47-7.46 2.22-.64 3.8-.74 9.12-.74 1.86 0 3.53-.83 5.57-2.62 1.08-.96 5.11-5.12 5.6-5.6 6.04-5.85 11.98-8.78 20.83-8.78 2.45 0 4.54.04 7.32.12 7.51.23 8.87.17 11.27-.7 3.03-1.1 5.53-3.03 14.75-11.17 8-7.06 10.72-8.92 22.87-16.47 1.44-.9 2.59-1.63 3.69-2.37a69.45 69.45 0 0 0 9.46-7.5c4.12-3.88 8.02-7.85 11.64-11.9v2.98a201.58 201.58 0 0 1-10.27 10.38c-3.18 3-6.2 5.35-9.72 7.7-1.12.76-2.28 1.5-3.75 2.4-12.05 7.5-14.71 9.32-22.6 16.28-9.46 8.35-12.01 10.32-15.39 11.55-2.74 1-4.19 1.06-12.01.82-2.76-.08-4.83-.12-7.26-.12-8.27 0-13.75 2.7-19.43 8.22-.44.43-4.52 4.64-5.68 5.66-2.37 2.09-4.46 3.12-6.89 3.12-5.1 0-6.6.1-8.56.66-2.67.78-5.29 2.37-11.85 7.15-9.8 7.13-17.85 9.19-30.59 9.19-9.22 0-24.96 14.2-34.13 30.49-7.84 13.94-18.24 21.02-34.55 26.46-5.31 1.77-7.21 8.51-6.75 19.78.1 2.6.31 5.19.68 8.84.75 7.62.75 7.58.75 9.43 0 1.38-.42 2.73-1.24 4.09-1.33 2.2-3.26 4.07-7.94 8-6.25 5.24-8.36 7.12-11.67 10.63a68.8 68.8 0 0 0-12.25 17.71 58.8 58.8 0 0 0-5 17.36c-1.49 10.66-.85 22.09 1.13 33.15.43 2.37.88 4.53 1.33 6.44.16.66.3 1.25.6 4.06a249.3 249.3 0 0 1-1.17 16.12c-.37 3.37-.78 6.53-1.25 9.44zm-13.4 0h-1.05l.12-.28c3.07-7.16 4.29-11.83 4.29-18.72 0-3.57-.07-4.93-.76-15.65-.77-12.04-1-19.64-.55-28.3.58-11.5 2.4-22.1 5.81-32.16 1.3-3.8 2.8-7.5 4.55-11.1 3.46-7.14 6.83-12.39 10.42-16.6a59.02 59.02 0 0 1 4.35-4.56c.43-.4 3-2.8 3.67-3.45 5.72-5.6 7.51-11.52 7.51-29.18 0-18.84 2.9-23.77 15.82-28.24 1.09-.37 1.92-.67 2.77-.98a51.3 51.3 0 0 0 6.1-2.7c4.95-2.6 9.64-6.22 14.44-11.42 25.5-27.63 37.15-35.16 56.37-35.16 8.28 0 14.54-1.95 22-6.3 1.78-1.03 13.82-8.82 18.16-11.27 2.83-1.59 5.66-3.03 8.63-4.39 7.92-3.6 13.97-4.45 26.6-4.8 7.53-.2 10.7-.49 14.26-1.58 4.55-1.4 8.06-4 10.93-8.43 2.2-3.41 6.85-7.08 14.66-12.06 1.61-1.03 3.27-2.05 5.65-3.5 9.53-5.85 11.56-7.13 14.81-9.57 5.34-4 9.3-8.37 13.68-14.77a204.2 204.2 0 0 0 5.62-8.75v1.9c-1.97 3.17-3.4 5.38-4.8 7.42-4.42 6.48-8.46 10.92-13.9 15-3.29 2.46-5.32 3.75-14.89 9.61a375.06 375.06 0 0 0-5.63 3.5c-7.7 4.9-12.26 8.52-14.36 11.76-3 4.63-6.7 7.39-11.48 8.85-3.68 1.12-6.9 1.42-14.53 1.63-12.5.34-18.44 1.18-26.2 4.7a111.08 111.08 0 0 0-8.56 4.35c-4.3 2.43-16.34 10.22-18.15 11.27-7.6 4.43-14.03 6.43-22.5 6.43-18.87 0-30.3 7.4-55.63 34.84-4.88 5.28-9.67 8.97-14.7 11.62-2 1.05-4 1.92-6.23 2.75-.86.32-1.7.62-5.37 1.87-5.08 1.76-7.44 3.25-9.28 6.37-2.23 3.78-3.29 9.94-3.29 20.05 0 17.9-1.87 24.07-7.8 29.89-.69.67-3.27 3.06-3.69 3.46a58.04 58.04 0 0 0-4.28 4.49c-3.53 4.14-6.86 9.32-10.28 16.38a95.19 95.19 0 0 0-4.5 10.99c-3.38 9.97-5.18 20.48-5.76 31.9-.44 8.6-.22 16.17.55 28.17.69 10.76.76 12.12.76 15.72 0 6.35-1.02 10.87-4.35 19zm25.08 0h-1c-.04-4.73.06-9.39.28-15.02.26-6.41-.4-11.79-2.53-24.37l-.31-1.86c-2.12-12.55-2.76-19.35-1.97-26.47 1.03-9.25 4.75-16.68 12-22.67 22.04-18.2 29.81-30.18 29.81-44.61 0-2.6-.3-4.81-.98-8.17-.97-4.79-1.1-5.68-.97-7.57.2-2.56 1.27-4.7 3.56-6.72 2.67-2.35 7.05-4.6 13.72-7.01 9.72-3.5 15.52-9.18 24.3-21.57l1.78-2.5c4.48-6.33 7.1-9.63 10.43-12.78 4.31-4.07 8.98-6.77 14.54-8.17 13.3-3.32 20.37-5.47 25.34-7.64a49.5 49.5 0 0 0 5.28-2.7c1.1-.65 1.75-1.04 4.24-2.6 2.7-1.68 5.22-2.08 11.38-2.28 5.44-.18 7.9-.43 10.97-1.41a21.47 21.47 0 0 0 9.54-6.22c4.87-5.3 10.03-7.61 17.79-8.9 1.07-.18 1.88-.3 3.86-.58 6.9-.97 9.94-1.69 13.48-3.62 4.5-2.45 6.79-4.44 23.46-19.68l3.14-2.85c9.65-8.71 16.12-13.83 21.42-16.48 4.25-2.12 7.6-4.69 11.22-8.6v1.45c-3.42 3.57-6.69 6-10.78 8.05-5.18 2.59-11.61 7.67-21.2 16.32l-3.12 2.85c-16.8 15.35-19.05 17.3-23.66 19.82-3.68 2-6.8 2.75-13.82 3.73-1.97.28-2.78.4-3.84.57-7.56 1.26-12.52 3.48-17.21 8.6a22.47 22.47 0 0 1-9.97 6.5c-3.2 1-5.72 1.27-11.25 1.45-5.98.2-8.39.57-10.89 2.13a144 144 0 0 1-4.25 2.61 50.48 50.48 0 0 1-5.39 2.75c-5.04 2.2-12.15 4.37-25.5 7.7-9.74 2.44-15.26 7.65-24.4 20.56l-1.77 2.5c-8.9 12.54-14.82 18.34-24.78 21.93-6.57 2.36-10.85 4.57-13.4 6.82-2.1 1.86-3.05 3.74-3.22 6.04-.13 1.76 0 2.63.95 7.3.7 3.42 1 5.7 1 8.37 0 14.79-7.93 27-30.18 45.39-7.03 5.8-10.64 13-11.64 22-.78 7-.14 13.73 1.96 26.2l.32 1.85c2.15 12.65 2.8 18.07 2.54 24.58-.22 5.57-.32 10.2-.28 14.98zM95.9 600h-2.04c.68-3.82 1.14-8.8 1.61-15.98.2-3.11.27-4.06.39-5.6 1.3-17.54 4.04-27.14 11.5-33.2 4.65-3.77 7.22-8.92 8.67-16 .51-2.52.7-3.87 1.33-9.17.66-5.5 1.16-8.06 2.24-10.36 1.45-3.09 3.82-4.69 7.39-4.69 14.28 0 38.48 9.12 53.6 20.2 8.66 6.35 21.26 13.32 31.74 17.11 13.03 4.71 21.89 4.41 24.75-1.73 1.7-3.64 1.92-4.11 2.65-5.77 2.93-6.67 4.69-12.2 5.25-17.5.23-2.17.24-4.23.02-6.2-.32-2.75-1.42-4.55-4.08-7.35l-1.32-1.37a30.59 30.59 0 0 1-2.41-2.79 30.37 30.37 0 0 1-2.5-4.07l-1.13-2.14c-1.62-3.1-2.68-4.6-4.12-5.56-5.26-3.5-14.8-5.5-28.55-6.83a272.42 272.42 0 0 0-9.04-.71l-2.18-.17c-9.57-.73-15.12-1.56-19.06-3.2C156.57 471.07 136 450.5 136 440c0-5.34 1.74-9.53 5.47-14.13 1.98-2.44 11.12-11.71 12.79-13.54 4.52-4.97 10.16-9.54 17.68-14.66 2.8-1.9 14.78-9.6 17.49-11.49a50.54 50.54 0 0 0 6.34-5.43c1.53-1.5 6.96-7.13 7.12-7.3 7.18-7.3 12.7-11.56 19.74-14.38 3.36-1.34 8.13-2.79 17.45-5.38a9577.18 9577.18 0 0 1 11.78-3.28 602.6 602.6 0 0 0 12.67-3.7c20.4-6.24 34-12.08 40.79-18.44 8.74-8.2 11.78-13.84 15.73-26.02 2.02-6.22 3.09-9.04 5.07-12.72 9.54-17.71 28.71-39.37 43.5-45.45C383.77 238.25 389 232.34 389 226c0-2.89 2.73-8.4 6.83-13.73 4.76-6.2 10.65-11.36 16.75-14.18 12.5-5.77 33.5-10.09 47.42-10.09 5.32 0 9.83-1.5 16.42-4.89 9.2-4.71 10.1-5.11 13.58-5.11 10.42 0 32.06-2.55 45.76-5.97l3.88-.98 3.47-.89c2.6-.66 4.33-1.08 5.93-1.43 3.9-.86 6.76-1.23 9.58-1.17 2.74.06 5.47.52 8.67 1.48 4.56 1.37 13.71-.9 22.87-5.68a68.07 68.07 0 0 0 9.84-6.2v2.4c-11.09 8.14-25.76 13.66-33.29 11.4a29.72 29.72 0 0 0-8.13-1.4c-2.63-.05-5.36.3-9.11 1.12a238 238 0 0 0-9.33 2.3l-3.9.99C522.38 177.43 500.58 180 490 180c-2.99 0-3.91.4-12.67 4.89-6.85 3.51-11.61 5.11-17.33 5.11-13.65 0-34.35 4.26-46.58 9.9-5.78 2.67-11.42 7.62-16 13.58-3.85 5.02-6.42 10.2-6.42 12.52 0 7.27-5.8 13.82-20.62 19.92-14.27 5.88-33.16 27.21-42.5 44.55-1.9 3.55-2.95 6.28-4.93 12.4-4.05 12.47-7.23 18.39-16.27 26.86-7.08 6.64-20.87 12.57-41.57 18.89a604.52 604.52 0 0 1-12.7 3.71 1495.1 1495.1 0 0 1-11.8 3.28c-9.24 2.58-13.97 4.01-17.24 5.32-6.73 2.69-12.05 6.8-19.05 13.92-.15.15-5.6 5.8-7.15 7.32a52.4 52.4 0 0 1-6.6 5.65c-2.74 1.92-14.75 9.63-17.5 11.5-7.4 5.04-12.94 9.52-17.33 14.35-1.72 1.9-10.8 11.11-12.71 13.46-3.47 4.26-5.03 8.03-5.03 12.87 0 9.5 20 29.5 33.38 35.08 3.67 1.53 9.1 2.34 18.45 3.05a586.23 586.23 0 0 0 4.34.32c3.24.23 5.07.37 6.93.55 14.08 1.37 23.82 3.4 29.45 7.17 1.82 1.2 3.02 2.91 4.8 6.29l1.11 2.13a28.55 28.55 0 0 0 2.34 3.81c.62.83 1.3 1.6 2.26 2.61.23.24 1.1 1.16 1.32 1.37 2.93 3.09 4.24 5.23 4.61 8.5.24 2.12.23 4.33-.01 6.64-.59 5.55-2.4 11.25-5.41 18.1-.74 1.67-.96 2.15-2.66 5.8-3.49 7.47-13.33 7.8-27.25 2.77-10.67-3.86-23.43-10.92-32.25-17.38C164.62 515.96 140.82 507 127 507c-5 0-6.4 3.02-7.64 13.29a99.03 99.03 0 0 1-1.36 9.33c-1.53 7.5-4.3 13.04-9.37 17.16-6.87 5.58-9.5 14.78-10.77 31.8-.11 1.52-.18 2.47-.38 5.57-.46 7.01-.91 11.99-1.57 15.85zm8.05 0h-1.02c.29-1.41.58-2.94.9-4.59l1.05-5.62c2.5-13.3 4.2-19.92 6.68-24.05 1.7-2.84 3.68-5.5 8.05-11.03 8.21-10.36 10.88-14.55 10.88-18.71l-.02-1.69c-.02-1.78-.02-2.7.02-3.77.21-5.05 1.47-8.2 4.64-9.4 3.92-1.5 10.39.44 20.12 6.43 9.56 5.88 17.53 10.7 25.91 15.66 1.31.78 14.27 8.41 17.67 10.45a714.21 714.21 0 0 1 6.42 3.9c13.82 8.5 38.94 5.05 46.3-7.83 3.6-6.28 4.54-8.52 7.78-17.32a82.3 82.3 0 0 1 1.18-3.07 42.27 42.27 0 0 1 4.06-7.64c9.33-13.98 14.92-26.1 14.92-36.72 0-3.66.75-6.62 3.36-14.85.52-1.64.83-2.66 1.15-3.73 3.64-12.23 3.04-19.12-4.29-24a23.1 23.1 0 0 0-9.98-3.78c-7.2-.93-14.49 1.17-23.91 5.88-1.55.78-6.64 3.44-7.6 3.93a62.6 62.6 0 0 0-4.14 2.3l-4.4 2.66c-11.62 6.92-20.4 9.18-32.81 6.08-3.32-.84-6.24-1.4-13.1-2.64-13.25-2.39-18.7-3.75-23.33-6.46-6.23-3.67-7.46-9.02-2.88-16.65A93.1 93.1 0 0 1 172 415.42a157 157 0 0 1 8.32-7.66c-.07.05 6.16-5.3 7.82-6.77a85.12 85.12 0 0 0 6.5-6.33c7.7-8.46 12.78-13.36 20.08-18.57 9.94-7.1 21.4-12.36 35.18-15.58 37.03-8.64 51-12.7 58.83-17.93 8.6-5.73 21.3-24.77 36.84-54.81 5.22-10.1 12.27-18.4 21.13-25.71 5.13-4.24 9.56-7.25 17.55-12.23 7.42-4.62 9.62-6.14 11.38-8.16a21.15 21.15 0 0 0 2.95-4.87c.61-1.3 2.87-6.47 3-6.77 1.36-3 2.56-5.4 3.95-7.73 6.53-10.97 16.03-18 31.4-20.8 12.73-2.3 19.85-2.7 29.68-2.3 3.25.13 4.13.16 5.6.14 5.15-.07 9.71-1.04 16.61-3.8 20.74-8.3 38.75-12.04 59.19-12.04 3.05 0 6.03.15 10.48.48l2.09.16c12.45.96 18.08.96 25.34-.63a49.65 49.65 0 0 0 14.09-5.45v1.15a50.52 50.52 0 0 1-13.88 5.28c-7.38 1.61-13.08 1.61-25.63.65l-2.08-.16c-4.43-.33-7.39-.48-10.41-.48-20.3 0-38.2 3.72-58.81 11.96-7.01 2.8-11.7 3.8-16.97 3.88-1.5.02-2.39-.01-5.66-.14-9.76-.4-16.8-.01-29.47 2.3-15.06 2.73-24.32 9.58-30.71 20.31a72.8 72.8 0 0 0-3.9 7.63c-.12.28-2.39 5.47-3.01 6.79a22 22 0 0 1-3.1 5.1c-1.86 2.13-4.07 3.66-11.6 8.35-7.95 4.96-12.35 7.95-17.44 12.15-8.76 7.23-15.73 15.43-20.89 25.4-15.61 30.2-28.36 49.32-37.16 55.19-7.98 5.32-21.97 9.39-59.17 18.07-13.65 3.18-24.98 8.39-34.82 15.42-7.22 5.16-12.27 10.01-19.92 18.43a86.07 86.07 0 0 1-6.57 6.4c-1.67 1.48-7.91 6.83-7.84 6.77-3.27 2.84-5.8 5.16-8.26 7.62a92.1 92.1 0 0 0-14.27 18.13c-4.3 7.16-3.22 11.89 2.53 15.26 4.47 2.63 9.88 3.99 23.24 6.39a185.7 185.7 0 0 1 12.92 2.6c12.11 3.03 20.64.84 32.06-5.96l4.4-2.65c1.66-1 2.96-1.73 4.2-2.35.95-.48 6.04-3.14 7.6-3.92 9.59-4.8 17.04-6.94 24.49-5.98a24.1 24.1 0 0 1 10.4 3.93c7.82 5.21 8.45 12.52 4.7 25.13-.32 1.07-.64 2.1-1.16 3.74-2.57 8.12-3.31 11.04-3.31 14.55 0 10.88-5.66 23.14-15.08 37.28a41.28 41.28 0 0 0-3.97 7.46c-.37.9-.73 1.82-1.18 3.04-3.25 8.85-4.21 11.13-7.84 17.47-7.67 13.42-33.43 16.95-47.7 8.18a578.4 578.4 0 0 0-6.4-3.89c-3.4-2.04-16.36-9.67-17.67-10.45-8.38-4.97-16.36-9.78-25.92-15.66-9.5-5.85-15.7-7.7-19.24-6.36-2.68 1.02-3.8 3.82-4 8.51a61.12 61.12 0 0 0-.02 3.72l.02 1.7c0 4.5-2.69 8.73-11.52 19.87-3.92 4.95-5.87 7.59-7.55 10.39-2.39 3.97-4.08 10.56-6.56 23.72l-1.05 5.62-.86 4.4zm10.5 0h-1c.03-.34.04-.68.04-1 0-12.39 8.48-33.57 19.16-43.37a26.18 26.18 0 0 0 3.67-4.17 35.8 35.8 0 0 0 2.88-4.9c.36-.72 1.75-3.66 2.1-4.36 3.22-6.29 6.84-6.54 16.97.39 1.34.9 6.07 4.16 6.4 4.38 2.62 1.8 4.67 3.2 6.7 4.56 5.03 3.39 9.37 6.2 13.51 8.7 14.33 8.67 25.49 13.27 34.11 13.27 16.86 0 32.71-5.95 39.6-14.8 1.59-2.04 3.2-5.17 5.06-9.63.8-1.92 1.64-4.06 2.67-6.8l2.74-7.33c4.66-12.44 7.76-19.06 11.56-23.27 7.9-8.79 14.87-36 14.87-52.67 0-1.9.17-3.11 1.02-8.27.37-2.2.58-3.6.74-5.07.63-5.51.21-9.46-1.68-12.39-4.6-7.1-19.7-9.23-38.46-4.78a100.57 100.57 0 0 0-18.94 6.3c-5.17 2.37-17.11 9.74-16.5 9.4-6.72 3.64-12.97 4.15-24.8 1.3-29.55-7.14-30.43-8.62-15.26-26.81 17.44-20.93 47.12-46.18 56.38-46.18 9.92 0 53.84-11.98 65.78-17.95 9.46-4.73 24.32-21.18 36.82-37.85.71-.95 13.5-21.6 19.2-29.6 9.35-13.13 18.22-22.55 26.95-27.53 7.29-4.17 13.16-10.28 18.8-18.73 1.93-2.9 10.52-17.65 12.73-20.41 1.54-1.93 3-3.21 4.52-3.89 14.07-6.25 24.22-9.04 39.2-9.04h29c4.05 0 7.36-.4 22.93-2.5l4.3-.57c9.92-1.3 16.57-1.93 21.77-1.93 1.66 0 2.95.01 6.03.04 18.61.19 28.55-.48 44.86-4.03 3.1-.67 6.13-1.78 9.11-3.31v1.12a37.96 37.96 0 0 1-8.9 3.17c-16.4 3.56-26.4 4.24-45.08 4.05-3.08-.03-4.36-.04-6.02-.04-5.15 0-11.76.63-21.64 1.92l-4.3.58c-15.64 2.11-18.94 2.5-23.06 2.5h-29c-14.81 0-24.84 2.75-38.8 8.96-1.34.6-2.69 1.78-4.14 3.6-2.16 2.68-10.72 17.39-12.68 20.33-5.72 8.57-11.7 14.8-19.13 19.04-8.57 4.9-17.36 14.23-26.63 27.24-5.68 7.97-18.47 28.64-19.22 29.63-12.6 16.8-27.52 33.32-37.18 38.15-12.06 6.03-56.14 18.05-66.22 18.05-8.82 0-38.39 25.15-55.62 45.82-14.6 17.52-14.19 18.21 14.74 25.2 11.6 2.8 17.6 2.3 24.09-1.2-.67.35 11.31-7.03 16.56-9.44 5.41-2.48 11.6-4.59 19.11-6.37 19.13-4.53 34.65-2.35 39.54 5.22 2.05 3.17 2.48 7.32 1.84 13.04a96.34 96.34 0 0 1-.75 5.13c-.84 5.08-1.01 6.29-1.01 8.1 0 16.9-7.03 44.33-15.13 53.33-3.68 4.09-6.76 10.65-11.37 22.96-.35.93-2.2 5.94-2.73 7.33-1.04 2.76-1.88 4.9-2.68 6.84-1.9 4.53-3.55 7.73-5.2 9.85-7.1 9.13-23.25 15.19-40.39 15.19-8.86 0-20.15-4.65-34.63-13.42-4.15-2.51-8.5-5.32-13.55-8.72a861.54 861.54 0 0 1-6.71-4.56l-6.4-4.39c-9.68-6.63-12.61-6.42-15.5-.75-.35.68-1.74 3.62-2.1 4.35a36.77 36.77 0 0 1-2.96 5.03c-1.12 1.57-2.37 3-3.81 4.33-10.47 9.6-18.84 30.51-18.84 42.63l-.03 1zm-29.65 0h-1.1c1.17-2.52 1.79-5.2 1.79-8 0-20 4.83-42.04 12.15-49.35 5.17-5.18 7.77-8.38 9.9-12.74 2.64-5.41 3.95-12 3.95-20.91 0-6.82 1.14-11.59 3.37-15.07 1.74-2.7 3.6-4.21 8.91-7.52a31.64 31.64 0 0 0 3.9-2.79c4.61-3.96 6.58-6.2 7.72-9.41 1.43-4.02.93-9.04-1.86-16.02a68.98 68.98 0 0 0-3.99-8.07l-.93-1.7a75.47 75.47 0 0 1-2.64-5c-5.16-10.71-3.77-18.9 7.68-29.78a204 204 0 0 1 26.81-21.55c3.96-2.69 16.8-10.8 19.24-12.5 1.99-1.4 4.33-3.3 7.77-6.3-.02 0 7.23-6.39 9.47-8.3 4.97-4.26 9.09-7.5 13.05-10.15 4.72-3.15 8.97-5.28 12.87-6.32 12.78-3.41 15.6-4.18 21.77-5.97 12.55-3.64 21.96-6.9 28.14-10a45.47 45.47 0 0 1 7.47-2.79c8.66-2.66 12.02-4.1 16.97-8.1 6.78-5.46 13.07-14.25 19.33-27.87 15.97-34.77 19.08-39.39 32.15-49.19 3.14-2.36 6.37-4.1 11.43-6.4l2.33-1.04c11.93-5.35 16.87-8.93 21.1-17.38 1.88-3.77 2.48-6.29 3.37-12.27.78-5.19 1.48-7.56 3.53-10.25 2.57-3.4 7.03-6.27 14.36-9.01 3.37-1.26 7.36-2.5 12.05-3.73 16.33-4.3 25.28-5.36 39.6-5.81 6.9-.22 9.5-.56 12.66-2 1.19-.54 2.36-1.23 3.58-2.11 3.7-2.7 8.14-4.54 13.24-5.67 5.71-1.27 10.69-1.54 18.7-1.45l2.35.02c2.82 0 6.8-1 19.7-4.69 10.83-3.08 15.95-4.31 19.3-4.31.82 0 1.9.13 3.55.41l5.01.9c9.82 1.68 17.44 1.89 25.15-.21 7.98-2.18 14.8-6.77 20.29-14.24V147c-5.47 7.04-12.21 11.42-20.03 13.55-7.88 2.15-15.63 1.94-25.58.23l-5-.9c-1.6-.26-2.64-.39-3.39-.39-3.2 0-8.32 1.22-19.74 4.48-12.35 3.53-16.3 4.52-19.26 4.52l-2.36-.02c-7.94-.1-12.85.17-18.47 1.42-4.97 1.11-9.3 2.9-12.88 5.5a21.4 21.4 0 0 1-3.75 2.22c-3.32 1.5-6 1.87-13.04 2.09-14.25.44-23.13 1.5-39.37 5.77a125.56 125.56 0 0 0-11.95 3.7c-7.17 2.7-11.49 5.46-13.93 8.68-1.9 2.52-2.58 4.76-3.33 9.8-.9 6.08-1.53 8.68-3.47 12.56a30.6 30.6 0 0 1-9.66 11.45c-3.12 2.26-5.95 3.73-11.93 6.4l-2.31 1.04c-5.01 2.27-8.18 3.99-11.25 6.29-12.9 9.68-15.93 14.17-31.85 48.8-6.31 13.76-12.7 22.68-19.6 28.25-5.08 4.1-8.53 5.57-17.3 8.27a44.64 44.64 0 0 0-7.33 2.73c-6.24 3.12-15.7 6.4-28.3 10.06a867.4 867.4 0 0 1-21.8 5.97c-3.77 1.01-7.93 3.1-12.56 6.19a137.35 137.35 0 0 0-12.95 10.07c-2.24 1.92-9.48 8.3-9.48 8.3a98.2 98.2 0 0 1-7.84 6.37c-2.46 1.72-15.32 9.83-19.26 12.5a203 203 0 0 0-26.69 21.45c-11.13 10.58-12.43 18.3-7.47 28.63a74.52 74.52 0 0 0 2.62 4.95l.94 1.7a69.84 69.84 0 0 1 4.03 8.17c2.88 7.2 3.4 12.46 1.89 16.73-1.22 3.43-3.28 5.77-8.02 9.84-1.14.97-2.32 1.8-5.3 3.67-3.92 2.45-5.69 3.89-7.31 6.42-2.13 3.3-3.22 7.89-3.22 14.53 0 9.05-1.34 15.79-4.05 21.34-2.19 4.49-4.85 7.77-10.1 13.01-7.07 7.07-11.85 28.9-11.85 48.65 0 2.8-.58 5.48-1.7 8zm282.54 0h-1.01l-1.1-5.8c-3.08-16.26-4.05-26.2-2.74-37.26.7-5.8.77-9.68.55-15.3-.18-4.45-.17-5.68.19-7.63.78-4.3 3.44-8.53 10.39-16.34 9.07-10.2 12.26-15.41 19.8-30.15 1.35-2.64 2.33-4.47 3.38-6.3.9-1.58 1.82-3.06 2.77-4.5 3.14-4.7 7.03-8.42 16.84-16.81 11.22-9.6 15.5-13.86 18.13-19.13.7-1.4 1.3-2.8 1.93-4.4a206 206 0 0 0 1.49-4.05c3.63-9.94 8.01-13.93 22.9-17.81 4.99-1.3 20.55-5.13 21.38-5.34 16.19-4.1 25.33-7.36 33.48-12.6 5.86-3.77 5.84-3.76 27.66-16.53l2.6-1.52c10.23-6 17.1-10.2 22.73-13.95a149.3 149.3 0 0 0 8.8-6.3 723.7 723.7 0 0 0 6.37-5.08A87.74 87.74 0 0 1 600 342.95v1.12a85.76 85.76 0 0 0-15.49 9.9c.18-.14-4.76 3.84-6.38 5.1a150.3 150.3 0 0 1-8.85 6.35c-5.65 3.76-12.53 7.96-22.78 13.97l-2.6 1.53c-21.8 12.75-21.78 12.74-27.63 16.5-8.27 5.32-17.49 8.61-33.78 12.73-.83.21-16.39 4.04-21.36 5.33-8.03 2.1-13.15 4.5-16.45 7.5-2.66 2.42-4 4.86-5.77 9.7l-1.5 4.07a51.12 51.12 0 0 1-1.96 4.47c-2.72 5.45-7.04 9.75-18.38 19.45-9.73 8.32-13.6 12.02-16.65 16.6a77.18 77.18 0 0 0-2.74 4.45c-1.05 1.81-2.01 3.63-3.35 6.25-7.58 14.81-10.82 20.08-19.96 30.36-6.83 7.7-9.4 11.78-10.15 15.86-.34 1.85-.34 3.04-.17 7.4.22 5.68.14 9.6-.55 15.47-1.3 10.92-.34 20.79 2.73 36.95l1.12 5.99zm-76.59 0h-2.1l1.39-4.3c1.04-3.3 1.93-6.78 2.68-10.4 2.65-12.73 3.27-23.63 3.27-41.3 0-5.71-1.86-9.75-4.13-9.75-2.94 0-6.96 5.61-10.93 17.08C271.14 579.68 258.3 593 238 593c-22.42 0-29.26-1.35-48.42-10.09a87.69 87.69 0 0 1-9.42-5.04c-2.95-1.8-12.78-8.57-14.84-9.72-4.2-2.36-7-2.71-9.72-.99-.63.4-1.26.91-1.9 1.55a57.69 57.69 0 0 1-4.31 3.86 147.88 147.88 0 0 1-3.06 2.44l-1 .8C137.01 582.43 134 587.18 134 597c0 1.02-.02 2.01-.07 3h-2c.05-.99.07-1.98.07-3 0-10.52 3.33-15.78 12.09-22.76a265.61 265.61 0 0 1 2-1.6c.83-.64 1.43-1.13 2.03-1.61a55.76 55.76 0 0 0 4.17-3.74c.74-.73 1.48-1.34 2.24-1.82 3.47-2.2 7-1.75 11.77.93 2.15 1.21 12.03 8 14.9 9.76a85.7 85.7 0 0 0 9.22 4.93C209.29 589.7 215.85 591 238 591c19.25 0 31.49-12.7 41.06-40.33 4.24-12.25 8.66-18.42 12.81-18.42 3.8 0 6.13 5.06 6.13 11.75 0 17.8-.63 28.8-3.3 41.7-.77 3.7-1.68 7.23-2.75 10.6-.4 1.3-.8 2.53-1.19 3.7zm-149.25 0l.5-.94a160.1 160.1 0 0 0 6.53-13.26c2.73-6.29 5.78-9.64 9.24-10.52 3.74-.95 7.15.74 12.56 5.13 5.43 4.4 6.07 4.86 7.73 5.1 1.6.22 4.28 1.14 8.86 2.95 1.3.5 10.78 4.35 13.85 5.55 3.07 1.2 5.85 2.25 8.49 3.18 3.1 1.1 5.98 2.04 8.65 2.81h-3.45c-1.76-.56-3.6-1.18-5.54-1.87a281.2 281.2 0 0 1-8.51-3.19c-3.08-1.2-12.57-5.04-13.86-5.55-4.5-1.78-7.15-2.68-8.63-2.9-1.94-.27-2.53-.7-8.22-5.3-5.17-4.2-8.36-5.78-11.69-4.94-3.1.78-5.94 3.92-8.56 9.95a161 161 0 0 1-6.82 13.8h-1.13zm112.89 0a30.34 30.34 0 0 0 11.27-6.27c1.55-1.36 3.32-3.46 5.34-6.29 1.05-1.46 2.15-3.1 3.41-5.04a349.73 349.73 0 0 0 2.5-3.9l.47-.75.93-1.47a89.17 89.17 0 0 1 3.25-4.86c1.05-1.43 1.82-2.23 2.44-2.46 1.02-.37 1.49.48 1.49 2.04l.01 2.11c.05 6.91-.08 11.32-.7 16.33a48.4 48.4 0 0 1-2.38 10.56h-1.07a46.47 46.47 0 0 0 2.45-10.68c.62-4.96.75-9.33.7-16.2l-.01-2.12c0-.97-.08-1.12-.15-1.1-.36.14-1.05.85-1.97 2.1a88.44 88.44 0 0 0-3.22 4.82l-.92 1.46-.48.75a1268.1 1268.1 0 0 1-2.5 3.92c-1.26 1.95-2.38 3.6-3.44 5.08-2.06 2.88-3.87 5.04-5.5 6.45a30.87 30.87 0 0 1-8.94 5.52h-2.98zm-183.72 0H69.3c3.37-3.43 5.19-8.33 5.19-15 0-18.6-.04-17.35 1.02-20.77.6-1.93 1.5-3.74 3.27-6.63.42-.7 4.92-7.8 6.78-10.86 3.04-4.97 11.04-16.5 12.21-18.56 3.48-6.08 4.72-12.06 4.72-24.18 0-7.85 2.5-14.2 8.1-23.44l2.84-4.63a72.67 72.67 0 0 0 2.49-4.4c1.62-3.15 2.48-5.78 2.62-8.28.2-3.78-1.3-7.29-4.9-10.9-5.13-5.12-8.6-5.43-11.2-1.85-2.12 2.92-3.48 7.74-5.06 16.47-.2 1.03-.82 4.6-.82 4.57-.83 4.67-1.4 7.33-2.1 9.6-1.35 4.42-3.7 7.61-8.36 12.26l-3.26 3.2c-6.38 6.39-9.68 11.51-11.36 19.5l-1.16 5.52c-.87 4.1-1.56 7.04-2.33 9.94-3.67 13.74-9.65 25.97-22.59 44.72-7.68 11.14-11.05 18.87-10.92 23.72h-1c-.12-5.16 3.35-13.05 11.1-24.28 12.87-18.67 18.8-30.8 22.44-44.42.77-2.88 1.45-5.8 2.32-9.89l1.16-5.51c1.73-8.22 5.13-13.5 11.64-20 .63-.64 2.84-2.8 3.25-3.21 4.57-4.54 6.82-7.62 8.12-11.84a81.58 81.58 0 0 0 2.07-9.48l.81-4.57c1.62-8.9 3-13.8 5.24-16.89 3-4.15 7.2-3.78 12.71 1.74 3.8 3.8 5.42 7.58 5.2 11.66-.15 2.66-1.05 5.41-2.73 8.68a73.6 73.6 0 0 1-2.52 4.46l-2.84 4.63c-5.52 9.1-7.96 15.3-7.96 22.92 0 12.28-1.28 18.43-4.85 24.68-1.2 2.1-9.21 13.65-12.22 18.58-1.87 3.06-6.37 10.18-6.78 10.86-1.73 2.82-2.6 4.57-3.17 6.4-1.02 3.28-.98 2.1-.98 20.48 0 6.52-1.7 11.44-4.82 15zM310.09 0h1.06c-.37.9-.77 1.83-1.2 2.82-3.9 9.06-5.45 15.15-5.45 25.18 0 7.64-2.1 11.6-6.64 13.05-3.46 1.1-5.72.98-17.57-.43-11.55-1.36-19.17-1.58-28.16-.14-6.24 2.49-25.91 7.02-32.13 7.02-11.15 0-36.76-2.88-54.12-7.01a22.08 22.08 0 0 0-16.95 2.48c-4.05 2.33-7.09 5.03-13.9 11.97-6.28 6.39-9.53 9.23-13.8 11.5-7.09 3.79-11.22 7.65-13.4 12.27-1.82 3.85-2.33 7.84-2.33 15.29 0 4.4-2.65 6.69-9.45 9.74.1-.05-2.97 1.31-3.84 1.71-8.78 4.06-12.71 8.29-12.71 16.55 0 12.52-4.86 19.22-17.34 27.96l-4.56 3.14c-1.9 1.3-3.3 2.3-4.67 3.3-.92.68-1.79 1.34-2.62 2-7.16 5.62-11 14.54-15.56 33.28-.63 2.57-3.3 14-4.07 17.14a350.44 350.44 0 0 1-5.2 19.33c-1.37 4.5-4.5 15.07-4.96 16.53-1.05 3.4-1.64 4.94-2.46 6.32-.82 1.4-6.85 9.08-12.64 18.27L0 277.98v-1.9l4.58-7.35a270.8 270.8 0 0 1 12.61-18.23c-.3.5 1.35-2.8 2.38-6.12.45-1.44 3.58-12.01 4.95-16.53 1.83-6.03 3.44-12.09 5.19-19.27.76-3.13 3.44-14.56 4.06-17.14 4.62-18.95 8.52-28.02 15.92-33.83.84-.67 1.72-1.33 2.65-2.01 1.38-1.02 2.8-2.01 4.7-3.32l4.54-3.14C73.83 140.57 78.5 134.13 78.5 122c0-8.74 4.2-13.26 13.29-17.45.88-.41 3.96-1.77 3.85-1.73 6.46-2.9 8.86-4.97 8.86-8.82 0-7.6.53-11.7 2.42-15.71 2.29-4.84 6.57-8.85 13.84-12.73 4.15-2.21 7.35-5 14.15-11.93 6.28-6.4 9.36-9.13 13.52-11.53a23.07 23.07 0 0 1 17.69-2.59c17.27 4.12 42.8 6.99 53.88 6.99 6.1 0 25.73-4.53 31.92-7 9.12-1.46 16.83-1.25 28.49.13 11.63 1.38 13.9 1.5 17.15.47 4.06-1.3 5.94-4.85 5.94-12.1 0-10.1 1.56-16.3 6.6-28zm25.12 0h1c.05 5.62.26 11.48.65 19.4.47 9.7.64 14.57.64 21.6 0 9.81-4.68 17.46-13.1 23.16-6.53 4.43-14.94 7.46-24.33 9.33-3.74.54-9.42.56-22.68.23-6.74-.17-9.35-.22-12.39-.22-2.77 0-4.97.43-7.63 1.36-.88.3-4.55 1.74-5.58 2.11-6.55 2.35-13.59 3.53-24.79 3.53-8.1 0-13.58-1.38-22.46-4.9l-3.18-1.25c-12.55-4.87-21.27-5.15-37.18 1.12-11.15 4.39-18.13 9.2-22.28 14.81-3.15 4.26-4.33 7.8-5.94 15.8-1.22 6.09-1.93 8.74-3.5 12.13-1.65 3.53-3.97 5.81-7.07 7.22-2.33 1.07-4.35 1.5-9.32 2.19-9.04 1.27-12.77 3.09-15.61 9.58-3.71 8.48-7.72 13.87-14.22 19.76-2.4 2.18-13.14 11.02-15.91 13.42-8.2 7.1-13.85 17.37-18.7 31.97a258.81 258.81 0 0 0-3.27 10.7c-.01.05-2.26 7.97-2.88 10.1-8.49 28.85-17.88 52.95-26.13 61.2-2.8 2.8-5.06 5.64-10.4 12.96-3.4 4.68-6.23 8.25-8.95 11.1v-1.55c2.74-2.98 5.73-6.82 9.48-11.97 4.03-5.52 6.32-8.4 9.17-11.24 8.07-8.08 17.44-32.14 25.87-60.8.62-2.1 2.86-10.03 2.88-10.08 1.21-4.24 2.21-7.53 3.28-10.74 4.9-14.75 10.63-25.16 19-32.4 2.78-2.42 13.5-11.25 15.89-13.4 6.4-5.8 10.32-11.09 13.97-19.43 1.68-3.83 4.05-6.31 7.2-7.86 2.4-1.17 4.64-1.67 9.53-2.36 4.54-.63 6.5-1.05 8.7-2.06 2.89-1.31 5.03-3.42 6.58-6.73 1.53-3.3 2.23-5.9 3.43-11.9 1.64-8.14 2.85-11.79 6.11-16.2 4.28-5.79 11.41-10.7 22.73-15.16 16.15-6.36 25.13-6.07 37.9-1.11l3.19 1.26c8.77 3.47 14.13 4.82 22.09 4.82 11.09 0 18.02-1.16 24.46-3.47 1-.36 4.68-1.8 5.58-2.11A22.5 22.5 0 0 1 265 72.5c3.05 0 5.67.05 14.07.26 11.53.29 17.2.27 20.83-.25 9.25-1.85 17.54-4.83 23.94-9.17C332 57.8 336.5 50.46 336.5 41c0-7-.17-11.86-.7-22.7-.35-7.26-.55-12.83-.59-18.3zM93.87 0h2.04c-.7 4-1.61 6.82-3.03 9.47-2.33 4.38-2.85 5.75-5.26 13.03a40.46 40.46 0 0 1-1.94 5.03c-2.24 4.66-5.92 8.8-13.07 14.26-8.01 6.13-14.27 16.55-20.03 31.55-2.4 6.23-8.75 25.63-9.64 28.01-2.69 7.16-6.56 12.7-15.63 23.68l-2.68 3.24c-6.02 7.34-9.35 12.07-11.72 17.15-2.3 4.94-7.12 9.9-12.91 14.15v-2.4c5.14-3.94 9.1-8.3 11.1-12.6 2.46-5.27 5.87-10.1 11.98-17.56l2.68-3.26c8.94-10.8 12.72-16.22 15.3-23.1.88-2.33 7.24-21.74 9.65-28.03 5.89-15.31 12.3-26 20.68-32.41 6.92-5.3 10.4-9.2 12.48-13.55.65-1.35 1.16-2.7 1.85-4.79 2.45-7.4 3-8.83 5.4-13.34A27.68 27.68 0 0 0 93.87 0zm9.07 0h1.02c-1.66 8.3-2.91 12.67-4.54 15.26a59.14 59.14 0 0 0-4.1 8.21c-1.27 3-2.44 6.2-3.5 9.4-.38 1.12-.7 2.16-2.41 5.39a251.48 251.48 0 0 0-12.81 13.3c-3.48 3.96-5.95 7.27-7.15 9.66-.95 1.9-2.06 5.99-3.61 12.97-.64 2.9-3.65 17.15-4.51 21.07-3.63 16.45-6.63 26.69-9.9 32-7.66 12.45-10.64 15.71-37.08 41.1A69.78 69.78 0 0 1 0 179.21v-1.15a69.39 69.39 0 0 0 13.65-10.42c26.4-25.33 29.32-28.55 36.92-40.9 3.2-5.18 6.18-15.37 9.78-31.7.86-3.91 3.87-18.16 4.51-21.06 1.57-7.09 2.7-11.2 3.7-13.2 1.24-2.5 3.76-5.86 7.29-9.89.9-1.03 1.86-2.1 2.86-3.18 2.4-2.6 4.96-5.22 7.53-7.76.9-.88 1.73-1.7 3.37-3.4a129.02 129.02 0 0 1 4.78-13.46 60.07 60.07 0 0 1 4.19-8.35c1.52-2.44 2.74-6.71 4.36-14.74zM83.71 0h1.1c-2.09 4.74-6.03 8.92-11.42 12.3-7.2 4.52-16.5 7.2-24.39 7.2-8.9 0-11.8 7-11.74 21.52 0 1.7.04 3.17.12 5.99.1 3.3.12 4.45.12 5.99 0 5.73-.76 11.3-2.01 16.5a66.67 66.67 0 0 1-2.15 6.97 2597.76 2597.76 0 0 1-7 15.86A4270.8 4270.8 0 0 1 6.44 136.2 54.64 54.64 0 0 1 0 147v-1.65a54.87 54.87 0 0 0 5.55-9.57A4269.82 4269.82 0 0 0 30.7 79.97c.53-1.2.99-2.23 2.44-5.9A69.23 69.23 0 0 0 36.5 53c0-1.52-.03-2.66-.12-5.95-.08-2.83-.12-4.31-.12-6.01-.03-6.79.53-11.62 2.07-15.34 1.94-4.68 5.39-7.19 10.67-7.19 7.7 0 16.81-2.63 23.86-7.05C77.93 8.27 81.66 4.38 83.7 0zm282.63 0h1.01c1.86 10.02 2.18 12.67 2.32 18.3a123.43 123.43 0 0 1 .37 27.83c-.96 8.78-3.1 16.01-6.63 21.15-11.34 16.5-39.8 29.22-66.41 29.22-5.09 0-10.47.28-16.31.83a413.8 413.8 0 0 0-24.37 3.16c-21.56 3.26-27.66 4.01-36.32 4.01-6.92 0-12.2-1.05-21.69-3.9l-2.78-.83c-1.39-.41-2.54-.74-3.65-1.02-8-2.05-14.22-2.04-21.7.72a16.32 16.32 0 0 0-9.17 8.18c-1.6 3.05-2.5 6.06-4.02 12.83-1.5 6.64-2.34 9.52-3.99 12.64a16.16 16.16 0 0 1-9.85 8.36 104.8 104.8 0 0 0-9.5 3.42c-6.55 2.8-10.1 5.57-13.8 10.47-1.33 1.75-1.03 1.3-5.43 7.9-1.98 2.97-4.66 5.8-8.48 9.14-2.01 1.76-10.71 8.83-12.88 10.7-7.37 6.35-12.58 12.14-16.63 19.14-4.22 7.3-7.8 18.3-11.28 33.26-.87 3.73-1.72 7.64-2.64 12.14l-1.18 5.8-1.09 5.45c-1.8 8.96-2.77 13.28-3.77 16.26-6.8 20.44-17.26 42.16-27.13 51.2-5.11 4.7-8.1 7.07-11.1 8.86-.9.54-1.84 1.04-2.92 1.57-.44.22-9.6 4.4-14.1 6.66l-1.22.62v-1.13l.78-.39c4.52-2.26 13.67-6.44 14.1-6.65a41.19 41.19 0 0 0 2.84-1.54c2.94-1.75 5.88-4.09 10.94-8.73 9.71-8.9 20.1-30.51 26.87-50.79.97-2.92 1.94-7.22 3.73-16.13l1.1-5.46a490.5 490.5 0 0 1 3.82-17.96c3.5-15.06 7.1-26.14 11.39-33.54 4.11-7.11 9.4-12.98 16.83-19.4 2.19-1.88 10.88-8.95 12.88-10.7 3.77-3.28 6.39-6.05 8.3-8.93 4.43-6.64 4.12-6.18 5.47-7.96 3.8-5.03 7.5-7.91 14.21-10.78 2.61-1.12 5.74-2.24 9.59-3.46a15.17 15.17 0 0 0 9.27-7.86c1.59-3.02 2.42-5.85 4.03-12.99 1.41-6.27 2.32-9.33 3.98-12.48a17.31 17.31 0 0 1 9.7-8.66c7.7-2.83 14.1-2.84 22.3-.75 1.12.29 2.28.61 3.68 1.03l3.73 1.11c8.47 2.54 13.66 3.58 20.46 3.58 8.59 0 14.67-.75 36.18-4a414.64 414.64 0 0 1 24.41-3.17c5.88-.54 11.29-.83 16.41-.83 26.3 0 54.45-12.58 65.59-28.78 3.42-4.98 5.5-12.06 6.46-20.7.84-7.74.73-16.02.02-23.9a136.2 136.2 0 0 0-.57-5.12c0-4.47-.3-6.94-2.16-17zM18.88 0h1.03C18 7.57 17.15 10.18 14.46 16.2c-1.95 4.37-2.67 9.19-2.42 14.89.2 4.33.71 7.7 2.28 16.13 1.09 5.88 1.57 8.77 1.94 12.2.96 8.9.24 16.08-2.8 22.79A463.4 463.4 0 0 1 0 109.43v-2.12a465 465 0 0 0 12.54-25.52c2.97-6.52 3.67-13.53 2.72-22.27-.36-3.4-.84-6.26-1.93-12.12-1.57-8.47-2.1-11.88-2.29-16.27-.26-5.84.48-10.81 2.5-15.33 2.64-5.9 3.48-8.47 5.34-15.8zm280.47 0a70.78 70.78 0 0 1-4.91 11.24c-2.56 4.7-4.01 8.45-4.86 11.98l-.4 1.8-.28 1.45a5.28 5.28 0 0 1-.74 2.07c-.74 1.03-1.93 1.28-5.13 1.25.92 0-9.85-.29-15.03-.29-10.2 0-18.45.82-29.46 2.56-16.87 2.66-17.73 2.77-23.66 2.52a42.57 42.57 0 0 1-8-1.09c-17.7-4.16-46.18-5.86-54.72-3.01-2.72.9-5.88 2.8-9.52 5.59a112.37 112.37 0 0 0-6.54 5.48c-1.4 1.25-9.17 8.5-10.78 9.84-1.45 1.2-8.18 7.42-8.85 8.02a114.65 114.65 0 0 1-4.55 3.9c-4.99 4.03-8.9 6.2-11.92 6.2-3.52.05-4.32 0-5.14-.4-1.13-.56-1.5-1.72-1.13-3.57.74-3.63 4.47-10.84 12.84-24.8 5.69-9.48 9.42-18 11.78-26.2 1.45-5.04 1.94-7.4 2.97-14.54h1.01c-1.05 7.3-1.54 9.7-3.01 14.82-2.39 8.28-6.16 16.89-11.9 26.44-8.3 13.84-12 21.01-12.7 24.48-.3 1.45-.08 2.14.59 2.47.6.3 1.35.35 3.48.3 3.92 0 7.69-2.1 12.5-5.98 1.4-1.13 2.87-2.39 4.51-3.86.66-.59 7.41-6.83 8.88-8.05 1.59-1.33 9.34-8.55 10.75-9.82 2.4-2.15 4.55-3.96 6.6-5.53 3.72-2.85 6.97-4.8 9.81-5.74 8.76-2.92 37.41-1.22 55.27 2.99 2.57.6 5.14.95 7.81 1.06 5.84.25 6.7.14 23.47-2.51 11.05-1.75 19.36-2.57 29.6-2.57 5.2 0 15.99.3 15.05.29 2.87.03 3.84-.17 4.3-.83.23-.32.4-.8.58-1.7l.28-1.43.4-1.85c.88-3.6 2.36-7.44 4.96-12.22 1.87-3.43 3.44-7 4.73-10.76h1.06zm-8.59 0c-5.91 17.94-9.55 22-19.76 22-4.5 0-10.22.32-28.69 1.5l-1.53.1c-15.6.99-23.47 1.4-28.78 1.4-5.35 0-13.24-.96-28.86-3.28l-1.54-.23C163.18 18.75 157.47 18 153 18c-4.45 0-7.3 1.01-10.96 3.34-.1.06-1.8 1.17-2.3 1.47-2.43 1.5-4.32 2.19-6.74 2.19-2.8 0-4.11-1.46-4.11-4.22 0-1.04.16-2.29.5-4.1.16-.82.9-4.4 1.07-5.32.8-4.11 1.3-7.68 1.47-11.36h2c-.17 3.82-.68 7.5-1.5 11.75-.19.94-.92 4.5-1.07 5.31a21.04 21.04 0 0 0-.47 3.72c0 1.7.46 2.22 2.11 2.22 1.99 0 3.55-.57 5.7-1.9.47-.28 2.15-1.37 2.26-1.44C144.92 17.14 148.12 16 153 16c4.62 0 10.3.74 28.9 3.51l1.53.23C198.93 22.04 206.8 23 212 23c5.25 0 13.11-.41 28.65-1.4l1.54-.1C260.73 20.32 266.43 20 271 20c8.95 0 12.15-3.4 17.66-20h2.1zM141.51 0h1.13c-2.06 3.86-2.63 5.1-2.77 6.19-.15 1.12.42 1.64 2.32 1.96 1.8.3 3.85.35 10.81.35 6.02 0 13 .56 21.35 1.62 3.95.5 8.03 1.1 13.13 1.89 24 3.7 22.5 3.49 26.83 3.49 24.02 0 51.83-2.24 60.45-6.94 2.88-1.57 5.05-4.49 6.6-8.56h1.07c-1.64 4.47-3.98 7.69-7.2 9.44-8.83 4.82-36.67 7.06-60.92 7.06-4.41 0-2.84.22-26.98-3.5-5.1-.8-9.17-1.38-13.1-1.88-8.31-1.06-15.26-1.62-21.23-1.62-7.04 0-9.1-.05-10.97-.37-2.38-.4-3.38-1.32-3.15-3.07.16-1.22.69-2.41 2.63-6.06zm76.4 0c5.69 1.64 10.37 2.5 14.09 2.5 9.59 0 16.7-.71 22.4-2.5h2.98C251.12 2.53 243.2 3.5 232 3.5c-4.5 0-10.32-1.21-17.53-3.5h3.45zM70.69 0c-2.87 3.27-6.95 5.39-12.02 6.53-3.98.89-7.5 1.08-12.92 1A97.24 97.24 0 0 0 44 7.5c-5.37 0-8.86-1.24-10.1-4.97A8.6 8.6 0 0 1 33.5 0h.99c.02.82.14 1.56.36 2.22C35.91 5.39 39.02 6.5 44 6.5l1.76.02c5.35.09 8.8-.1 12.69-.97C62.95 4.54 66.63 2.74 69.3 0h1.37zM0 207.87c7.31-.16 11.5 3.33 11.5 11.13 0 11.41-5.05 28.35-11.5 41.5v-2.3c5.93-12.72 10.5-28.47 10.5-39.2 0-7.18-3.7-10.3-10.5-10.13v-1zm0 7.05c1.23.14 2.18.58 2.87 1.31 1.4 1.48 1.6 3.72 1.16 7.58l-.16 1.3A28.93 28.93 0 0 0 3.5 229c0 3.2-1.48 9.52-3.5 15.9v-3.45c1.49-5.13 2.5-9.87 2.5-12.45 0-.98.08-1.75.37-4.02l.16-1.29c.42-3.56.24-5.59-.88-6.77-.5-.53-1.21-.87-2.15-1v-1zM0 410.9v-1.47a21.67 21.67 0 0 0 2.97-4.7c1.32-2.7 2.68-6.28 4.56-11.89 7.85-23.55 7.83-26.6.25-30.4-2.25-1.12-4.8-1.43-7.78-.91v-1.02a13.1 13.1 0 0 1 8.22 1.04c8.24 4.12 8.26 7.6.25 31.6-1.88 5.66-3.25 9.27-4.6 12.02A20.82 20.82 0 0 1 0 410.9zM33.64 452c1.68 0 3.04-.23 8.34-1.31l2.38-.47c8.26-1.57 12.72-1.3 14.53 2.33 1.38 2.75-.47 5.86-4.75 9.68a75.6 75.6 0 0 1-5.08 4.07c-.94.7-4.89 3.59-5.79 4.27-1.86 1.4-2.97 2.37-3.47 3.03a19.08 19.08 0 0 0-2.89 5.5c.07-.2-4.02 13.65-6.96 22.22-2.7 7.85-5.56 10.72-8.82 8.59-2.11-1.4-3.66-4.24-6.6-11.03-1.98-4.62-2.5-5.76-3.4-7.4-4.55-8.18-3.9-23.9-.05-32.87a9.6 9.6 0 0 1 6.98-5.96c2.59-.66 4.86-.75 11.78-.67l3.8.02zm0 2c-1.13 0-2.09 0-3.82-.02-12.07-.13-14.83.57-16.9 5.41-3.63 8.47-4.26 23.55-.05 31.12.96 1.73 1.48 2.88 3.5 7.58 2.72 6.3 4.24 9.08 5.86 10.14 1.64 1.08 3.5-.8 5.82-7.55a682.9 682.9 0 0 0 6.97-22.24 21.03 21.03 0 0 1 3.18-6.04c.65-.87 1.85-1.9 3.86-3.43.92-.7 4.87-3.57 5.8-4.27 2.02-1.5 3.6-2.77 4.95-3.97 3.63-3.23 5.09-5.7 4.3-7.28-1.21-2.42-5.07-2.65-12.38-1.27l-2.35.47c-5.49 1.11-6.86 1.35-8.74 1.35zm345.63 146c-3.45-12.26-3.77-14.13-3.77-19 0-3.33-.13-6.27-.43-11.34-.63-10.33-.65-13.5.26-17.07 1.21-4.74 4.21-7.1 9.67-7.1h26c4.08 0 5.19 1.85 5.93 7.11.1.79.13.97.19 1.32.84 5.35 2.8 7.58 8.88 7.58 3.64 0 5.54.4 6.43 1.37.76.83.76 1.44.36 3.93-.85 5.26.5 8.85 7.5 13.8 6.32 4.45 11.63 5.36 16.55 3.37 3.8-1.54 6.73-4.16 11.92-10l1.1-1.23 1.09-1.23a75.6 75.6 0 0 1 2.7-2.86 35.81 35.81 0 0 1 9.57-6.73c1.52-.76 1.72-.86 5.66-2.63 6.1-2.73 9.01-4.5 11.74-7.62 2.63-3 4.67-4.85 6.7-6.04 3.18-1.85 5.46-2.13 13.68-2.13 5.98 0 10.56-4.32 18-14.99l2.82-4.03c1.06-1.5 1.94-2.7 2.79-3.79 7.87-10.12 19.38-10.4 30.74.96 5.54 5.53 10.17 19.43 13.64 38.51 2.5 13.75 4.18 29.46 4.47 39.84h-1c-.3-10.32-1.96-25.97-4.45-39.66-3.43-18.87-8.02-32.65-13.36-37.99-10.95-10.95-21.76-10.68-29.26-1.04-.83 1.07-1.7 2.26-2.75 3.75l-2.81 4.02c-7.65 10.95-12.38 15.42-18.83 15.42-8.04 0-10.21.26-13.17 2-1.92 1.12-3.9 2.9-6.45 5.83-2.86 3.26-5.87 5.09-12.09 7.88a103.35 103.35 0 0 0-5.62 2.6 34.84 34.84 0 0 0-9.32 6.54 74.67 74.67 0 0 0-3.75 4.05l-1.1 1.24c-5.28 5.95-8.29 8.64-12.28 10.25-5.26 2.13-10.92 1.17-17.5-3.48-7.33-5.17-8.82-9.15-7.92-14.77.34-2.12.34-2.6-.1-3.1-.64-.69-2.34-1.04-5.7-1.04-6.63 0-8.96-2.63-9.87-8.42l-.2-1.34c-.67-4.82-1.53-6.24-4.93-6.24h-26c-5 0-7.6 2.04-8.7 6.34-.88 3.43-.85 6.57-.23 16.76a177 177 0 0 1 .43 11.4c0 4.78.32 6.63 3.81 19h-1.04zm13.68 0c-1.31-6.58-1.61-10.71-1.36-14.84.04-.7.1-1.44.18-2.38l.23-2.56c.34-3.81.5-6.97.5-11.22 0-4.94 1.46-7.76 4.21-8.42 2.38-.58 5.56.54 9.2 3 6.64 4.52 13.99 13.07 16.55 19.23 4.77 11.44 14.12 15.69 33.54 15.69 8.6 0 14.32-2.35 20.67-7.88 1.45-1.26 15.06-15 21-20 7.21-6.07 11.77-7.59 20.62-8.32 5.52-.45 7.98-.9 11.44-2.36 4.58-1.95 9.36-5.48 14.9-11.29 7.43-7.76 13.25-8.92 17.47-4.3 3.32 3.63 5.46 10.58 6.82 20.24.73 5.17.94 7.74 1.58 17.38.25 3.75.17 5.32-.92 18.03h-1c1.09-12.7 1.17-14.28.92-17.97-.64-9.6-.85-12.16-1.57-17.3-1.33-9.47-3.43-16.27-6.56-19.7-3.76-4.11-8.93-3.08-16 4.32-5.65 5.9-10.54 9.5-15.25 11.5-3.58 1.53-6.13 1.99-11.6 2.44-8.8.72-13.17 2.18-20.2 8.1-5.9 4.96-19.5 18.7-21 19.99-6.52 5.68-12.47 8.12-21.32 8.12-19.78 0-29.5-4.42-34.46-16.3-2.49-5.97-9.71-14.38-16.2-18.79-3.42-2.32-6.36-3.35-8.4-2.86-2.2.53-3.44 2.92-3.44 7.45 0 4.28-.16 7.47-.5 11.31l-.23 2.56c-.09.93-.14 1.65-.19 2.35-.24 4.08.06 8.18 1.39 14.78h-1.02zm113.75 0c2.52-3.26 8.93-11.79 10.9-14.3 5.48-6.98 13.05-12.38 19.4-13.94 7.01-1.71 11.5 1.45 11.5 9.24 0 4.02-.04 5.16-.74 19h-1c.7-13.85.74-15 .74-19 0-7.12-3.86-9.83-10.26-8.26-6.11 1.5-13.5 6.77-18.85 13.57-1.86 2.36-7.65 10.07-10.43 13.69h-1.26zm-9.86-338.96c3.44 2.71 7 5.1 11.44 7.75 1.06.64 8.42 4.9 10.35 6.1 11.27 7 15 13.35 12.35 25.33-1.45 6.52-4.53 11.1-9.39 14.44-3.83 2.63-8.07 4.26-16.08 6.56-11.97 3.45-13.68 3.99-18.82 6.28a60.18 60.18 0 0 0-7.81 4.18c-11.11 7.07-19.1 7.7-27.96 3.28-3.56-1.77-17.2-11-17.2-11.01a101.77 101.77 0 0 0-5.2-3.07c-16.04-8.83-34.27-24.16-34.52-31.85-.11-3.46 1.99-6.57 6.28-10.26 1.03-.9 2.18-1.81 3.68-2.95.72-.55 3.38-2.56 3.94-3 4.47-3.4 7.18-5.79 9.32-8.45 11.12-13.82 26.55-28.68 34.36-32.28 12.06-5.54 19.84-5.77 27.37.12 3.25 2.54 5.65 6.54 8.58 13.35.29.65 2.3 5.45 2.88 6.74 1.62 3.65 2.9 5.8 4.24 6.94.72.6 1.45 1.2 2.2 1.8zm-3.49-.28c-1.63-1.39-3.03-3.74-4.77-7.65-.58-1.3-2.6-6.12-2.88-6.76-2.81-6.5-5.08-10.3-7.98-12.56-6.83-5.35-13.85-5.15-25.3.12-7.45 3.42-22.7 18.12-33.64 31.72-2.27 2.82-5.08 5.3-9.67 8.79l-3.94 2.98a79.98 79.98 0 0 0-3.59 2.88c-3.87 3.33-5.67 6-5.58 8.69.21 6.64 18.14 21.72 33.48 30.15 1.76.97 3.5 2 5.3 3.13.12.08 13.61 9.22 17.03 10.92 8.22 4.1 15.46 3.52 26-3.18a62.17 62.17 0 0 1 8.07-4.31c5.25-2.35 7-2.9 19.08-6.38 7.8-2.24 11.9-3.82 15.5-6.3 4.44-3.04 7.23-7.18 8.56-13.22 2.44-11.02-.83-16.6-11.45-23.2-1.9-1.18-9.23-5.42-10.32-6.08-4.5-2.69-8.13-5.12-11.64-7.9-.77-.6-1.52-1.21-2.26-1.84zM87.72 241.6c4.3-2.98 7.88-5 12.14-6.95.84-.4 1.73-.78 2.78-1.24l4.37-1.88a164.3 164.3 0 0 0 17.74-8.96 320.67 320.67 0 0 1 27.87-14.5c4.22-1.95 21.89-9.84 21.17-9.52 19.17-8.62 28.1-6.93 49.5 8.05 7.91 5.54 13.24 13.25 16.45 22.66 3.02 8.83 3.76 16.51 3.76 27.75 0 8.32-.66 12.95-3.68 18.97-4.18 8.36-12.3 16.14-25.58 23.47-24.45 13.49-38.83 27.55-52.83 47.84-8.83 12.8-47.76 44.21-65.16 54.15C75.04 413.55 48.89 423.5 31 423.5c-10.05 0-14.67-4.78-14.76-13.37-.07-6.32 2.06-13.73 6.3-24.32 2.95-7.37 2.02-12.9-2.16-22.29-3.19-7.17-3.88-9.14-3.88-12.52 0-3.35 1.87-6.9 5.52-11.07 2.61-3 3.5-3.83 11.9-11.5 5.09-4.66 8.08-7.6 10.7-10.75 9.46-11.36 12.62-19.47 17.9-44.78 3.12-15.05 6.63-20.28 15.12-25.25.8-.47 3.95-2.25 4.7-2.68a76.66 76.66 0 0 0 5.38-3.38zm.56.82a77.63 77.63 0 0 1-5.44 3.43l-4.7 2.67c-8.23 4.82-11.57 9.81-14.65 24.6-5.3 25.45-8.51 33.7-18.1 45.21-2.66 3.19-5.68 6.16-10.8 10.84-8.36 7.64-9.24 8.48-11.82 11.42-3.5 4.01-5.27 7.36-5.27 10.42 0 3.18.68 5.1 3.8 12.12 4.27 9.6 5.24 15.37 2.16 23.07-4.18 10.47-6.29 17.78-6.22 23.93.08 8.06 4.26 12.38 13.76 12.38 17.67 0 43.68-9.9 64.75-21.93 17.28-9.88 56.1-41.2 64.84-53.85 14.08-20.42 28.57-34.59 53.17-48.16 13.12-7.23 21.09-14.87 25.17-23.03 2.92-5.86 3.57-10.35 3.57-18.53 0-11.13-.74-18.73-3.7-27.43-3.15-9.22-8.36-16.75-16.09-22.16-21.13-14.8-29.7-16.42-48.5-7.95.7-.32-16.96 7.56-21.17 9.5-1.7.8-3.3 1.55-4.86 2.3a319.68 319.68 0 0 0-22.93 12.17 165.3 165.3 0 0 1-17.85 9.01l-4.37 1.88c-1.04.45-1.92.84-2.76 1.23a74.56 74.56 0 0 0-11.99 6.86zm-7.6 12.2c7.7-6.25 12.3-8.17 23.68-11.27 6.12-1.67 9.12-2.95 12.31-5.72 3.8-3.3 7.47-4.52 15.86-6.1 2.75-.52 3.67-.7 5.06-1.02 5.48-1.24 9.48-2.93 13.1-5.89 10.42-8.53 25.4-14.11 36.31-14.11 5.33 0 16.77 7.58 25.74 17.16 10.73 11.46 15.96 23.27 12.73 32.5-3.18 9.1-11.39 18.57-23.03 27.86-8.44 6.73-18.36 13-25.22 16.43-3.72 1.86-6.59 4.88-9.77 9.99-.69 1.1-11.1 20.25-16.03 27.83-5.62 8.65-15.4 17.36-30.23 27.96a552.58 552.58 0 0 1-9.2 6.42c-.13.09-6.81 4.65-8.6 5.89-6.47 4.46-10.35 7.35-13.05 9.83-11.64 10.67-37.14 15.54-43.7 8.98-1.96-1.96-2.2-4.06-1.95-10.52.37-9.42-.5-14.5-4.95-20.51a34.09 34.09 0 0 0-7.04-6.92c-3.93-2.95-6.07-6.11-6.56-9.49-.97-6.61 3.87-13.06 14.17-21.69 1.58-1.32 6.67-5.44 7.09-5.78a48.03 48.03 0 0 0 5.23-4.77c4.1-4.63 5.85-9.55 7.8-20.07a501.52 501.52 0 0 0 .8-4.37c.33-1.87.6-3.3.88-4.73.74-3.78 1.5-7.18 2.4-10.63 1-3.78 1.38-5.5 2.36-10.37.6-3.02.93-4.21 1.56-5.47 1.22-2.45 1.27-2.5 12.25-11.42zm.64.78c-10.77 8.74-10.88 8.84-12 11.08-.58 1.16-.88 2.3-1.47 5.22-.98 4.89-1.36 6.63-2.37 10.44-.9 3.43-1.65 6.8-2.39 10.56a339.79 339.79 0 0 0-1.29 6.95l-.39 2.15c-1.98 10.68-3.77 15.74-8.04 20.54a48.77 48.77 0 0 1-5.34 4.88c-.42.34-5.5 4.47-7.07 5.78-10.04 8.4-14.72 14.65-13.83 20.78.45 3.1 2.44 6.03 6.17 8.83 3 2.25 5.39 4.62 7.24 7.12 4.63 6.24 5.52 11.52 5.15 21.15-.25 6.14-.01 8.1 1.66 9.78 6.1 6.1 31.02 1.33 42.31-9.02 2.75-2.52 6.66-5.43 13.16-9.92l8.6-5.89c3.63-2.48 6.45-4.44 9.19-6.4 14.73-10.54 24.44-19.18 29.97-27.7 4.9-7.54 15.31-26.68 16.02-27.8 3.27-5.26 6.26-8.41 10.18-10.37 6.79-3.4 16.65-9.63 25.03-16.32 11.52-9.18 19.61-18.53 22.72-27.4 3.07-8.78-2.02-20.27-12.52-31.49-8.8-9.4-20.04-16.84-25.01-16.84-10.67 0-25.43 5.5-35.68 13.89-3.76 3.07-7.9 4.81-13.5 6.09-1.41.32-2.35.5-5.11 1.02-8.21 1.55-11.76 2.73-15.38 5.88-3.34 2.9-6.45 4.22-12.7 5.92-11.26 3.07-15.75 4.94-23.31 11.09zM212 251.85c0 7.56-.6 10.92-2.6 14.3-1.1 1.84-7.66 10.05-8.6 11.3-5.96 7.94-9.33 10.28-17.26 13.76-1.34.58-2.2 1-3.03 1.5-.55.33-1.2.66-2 1.02-.71.33-4.46 1.9-5.52 2.39-6.05 2.78-8.99 5.8-8.99 10.73 0 10.97-18.95 36.12-34.51 44.87-8.18 4.6-21.3 9.36-32.78 11.86-13.33 2.9-22.49 2.48-24.62-2.32-1.32-2.97-4.4-4.26-11.98-5.81l-.6-.12c-4.84-.99-6.94-1.55-9.03-2.64-2.92-1.5-4.48-3.7-4.48-6.84 0-2.74 1.08-5.77 3.25-9.67.85-1.53 1.82-3.13 3.23-5.35-.16.25 2.83-4.4 3.67-5.76 6.69-10.7 9.85-18.5 9.85-27.22 0-18.41 11.22-33.37 27.5-42.86 5.22-3.05 9.23-3.31 15.2-2.12 5.04 1 6.05.9 7.43-1.52 4.5-7.85 7.04-9.5 15.87-9.5 3.93 0 6.97-.98 10.47-3.16 1.56-.97 8.67-6.17 10.99-7.68 9.2-5.98 11.34-7 25.2-11.95 6.95-2.48 15.18 1.28 22.33 9.12 6.55 7.19 11.01 16.61 11.01 23.67zm-2 0c0-6.5-4.25-15.48-10.49-22.32-6.67-7.32-14.16-10.74-20.17-8.59-13.73 4.9-15.73 5.85-24.8 11.75-2.24 1.46-9.37 6.68-11.01 7.7-3.8 2.36-7.2 3.46-11.53 3.46-8.08 0-9.98 1.23-14.13 8.5-1.1 1.91-2.51 2.88-4.35 3.09-1.3.14-1.9.05-5.22-.61-5.53-1.1-9.07-.88-13.8 1.88-15.72 9.17-26.5 23.55-26.5 41.14 0 9.2-3.28 17.29-10.15 28.28l-3.68 5.77c-1.39 2.19-2.35 3.77-3.17 5.25-2.02 3.63-3 6.38-3 8.7 0 4.19 2.87 5.67 11.9 7.52l.61.12c8.27 1.7 11.7 3.13 13.4 6.95 3.17 7.14 36 0 54.6-10.46 14.98-8.43 33.49-32.99 33.49-43.13 0-5.9 3.47-9.48 10.16-12.55 1.1-.5 4.85-2.08 5.52-2.38.74-.34 1.32-.64 1.8-.93.92-.55 1.85-1 3.25-1.62 7.65-3.35 10.75-5.5 16.47-13.12 1.02-1.36 7.47-9.42 8.47-11.11 1.79-3.01 2.33-6.06 2.33-13.3zm-37.18-22.4c.15-.1 2.4-1.51 2.95-1.84.96-.57 1.7-.94 2.43-1.17 2.57-.83 5.06-.1 11.04 3.12 14.86 8 19.43 22.87 9.18 38.71-4.04 6.24-9.37 9-18.72 11.11-.85.2-1.2.27-3.13.68-6.04 1.29-8.78 2.08-11.6 3.65-3.63 2.02-6.09 4.98-7.5 9.44-7.87 24.93-19.72 43.34-36.28 50.31-16.45 6.93-21.13 8.53-27.98 8.89-4.94.25-9.8-.65-15.4-2.89a44.45 44.45 0 0 1-5.64-2.6c-4.02-2.33-5.14-4.74-4.5-9.31.3-2.13 3.77-15.53 4.84-20.65.63-3.05 1.19-6.14 1.75-9.69a464.04 464.04 0 0 0 1.35-8.9c1.42-9.41 2.5-14.27 4.49-18.65 2.46-5.43 6.13-9.03 11.72-11.13 6.59-2.47 10.54-3.1 18.03-3.53 4.75-.27 6.68-.64 9-2.05.61-.37 1.22-.81 1.82-1.33a30.61 30.61 0 0 0 3.37-3.4c.59-.69 2.38-2.9 2.63-3.19 3.36-4 6.3-5.53 12.33-5.53 3.94 0 5.9-.92 8.18-3.36-.17.18 2.75-3.14 3.85-4.22a30.95 30.95 0 0 1 6.79-5c1.5-.83 3.15-1.62 4.99-2.38a64.92 64.92 0 0 0 10.01-5.1zm-14.52 8.34a29.95 29.95 0 0 0-6.57 4.84 116.68 116.68 0 0 0-3.82 4.2c-2.46 2.63-4.68 3.67-8.91 3.67-5.72 0-8.39 1.39-11.57 5.17-.23.28-2.03 2.5-2.63 3.2a31.6 31.6 0 0 1-3.47 3.51c-.65.55-1.3 1.03-1.96 1.43-2.5 1.51-4.55 1.9-9.47 2.19-7.39.42-11.25 1.04-17.72 3.47-5.34 2-8.82 5.4-11.17 10.6-1.93 4.27-3 9.07-4.41 18.39l-.65 4.34-.7 4.57c-.57 3.56-1.12 6.67-1.76 9.73-1.08 5.18-4.54 18.53-4.83 20.59-.59 4.17.35 6.18 4.01 8.3 1.35.77 3.1 1.58 5.52 2.55 5.46 2.18 10.18 3.05 14.97 2.8 6.69-.34 11.32-1.93 27.65-8.8 16.21-6.83 27.92-25.01 35.71-49.7 1.49-4.7 4.12-7.86 7.97-10 2.93-1.63 5.74-2.45 11.87-3.76 1.92-.4 2.28-.49 3.12-.68 9.12-2.06 14.24-4.7 18.1-10.67 9.92-15.34 5.55-29.55-8.82-37.29-5.75-3.1-8.03-3.76-10.25-3.05-.65.2-1.33.54-2.23 1.08-.55.32-2.77 1.72-2.93 1.82a65.91 65.91 0 0 1-10.16 5.17c-1.8.75-3.42 1.52-4.89 2.33zm-42.39 32.72c16.15-2.87 26.36-.97 32.47 6.16 5.08 5.93 1.13 21.42-5.93 35.55-4.79 9.58-10.6 16.21-23.16 25.19-14.15 10.1-35.5 12.2-40.71 3.85-1.86-2.97-2.1-8.14-1.06-15.73.78-5.68 1.86-10.71 4.73-22.98l.12-.51c1.59-6.8 2.37-10.31 3.14-14.14 1.45-7.25 3.74-11.47 7.26-13.74 2.81-1.8 5.53-2.28 12.33-2.62 5.33-.27 7.56-.46 10.81-1.03zm.18.98c-3.3.59-5.56.78-10.94 1.05-6.62.33-9.23.78-11.84 2.46-3.25 2.1-5.42 6.09-6.82 13.1-.77 3.84-1.56 7.35-3.15 14.17l-.12.5c-2.86 12.24-3.93 17.26-4.7 22.9-1.03 7.36-.79 12.36.9 15.07 4.82 7.7 25.54 5.67 39.29-4.15 12.43-8.88 18.13-15.39 22.84-24.81 6.86-13.72 10.75-29 6.07-34.45-5.84-6.81-15.7-8.65-31.53-5.84zM132 276.5c7.12 0 10.66 3.08 11.25 8.7.42 4.02-.43 8.14-2.77 15.94-2.56 8.52-18.36 25.38-27.2 31.28-7.01 4.67-20.02 5.67-26.57.99-3.99-2.85-3.53-12.08.02-26.46.68-2.75 1.47-5.65 2.37-8.76a412.6 412.6 0 0 1 3.05-10.14l.37-1.2c1.48-4.8 5.1-7.75 10.73-9.27 4.4-1.2 9.54-1.5 17.48-1.33l3.89.1c3.87.11 5.42.15 7.38.15zm0 1c-1.97 0-3.53-.04-7.41-.15l-3.88-.1c-7.85-.17-12.92.13-17.2 1.3-5.32 1.43-8.67 4.16-10.03 8.6a1277.83 1277.83 0 0 1-1.6 5.21c-.68 2.2-1.27 4.17-1.82 6.1-.9 3.1-1.68 5.99-2.36 8.73-3.43 13.88-3.87 22.93-.4 25.4 6.17 4.42 18.73 3.45 25.42-1 8.66-5.78 24.33-22.49 26.8-30.73 2.3-7.67 3.14-11.71 2.73-15.56-.53-5.1-3.64-7.8-10.25-7.8zm-17.79 7a31.3 31.3 0 0 1 8.57 1.4c5.42 1.78 8.72 5.03 8.72 10.1 0 9.59-9.51 17.2-22.34 21.47-9.82 3.28-13.62-1.79-11.66-16.54.84-6.28 3.82-10.67 8.24-13.46a20.38 20.38 0 0 1 8.47-2.97zm-.6 1.08a19.39 19.39 0 0 0-7.34 2.73c-4.18 2.64-6.98 6.78-7.77 12.76-1.89 14.11 1.36 18.45 10.34 15.46C121.3 312.37 130.5 305 130.5 296c0-4.56-2.98-7.5-8.03-9.15a28.05 28.05 0 0 0-8.2-1.35c-.13 0-.35.03-.66.08zm80.87-23.45c-2.72 9.8-14.93 9.86-26.72 3.3-10.17-5.64-13.8-17.98-5-22.87a66.53 66.53 0 0 0 4.48-2.7l2.03-1.3a50.15 50.15 0 0 1 3.92-2.3c4.73-2.43 8.82-2.8 14-.72 9.16 3.66 10.98 13.33 7.3 26.6zm-20.83-24.98a49.26 49.26 0 0 0-3.84 2.25l-2.03 1.3c-.84.53-1.5.95-2.16 1.35-.82.5-1.6.96-2.38 1.39-7.94 4.4-4.59 15.8 5 21.12 11.31 6.29 22.8 6.23 25.28-2.7 3.57-12.83 1.85-21.97-6.7-25.4-4.9-1.95-8.69-1.62-13.17.7zm17.85 12.15c0 5.7-2.44 9-6.64 9.96-3.3.76-7.56-.05-11.08-1.81l-1.89-.94c-.67-.34-1.18-.62-1.63-.88-4.07-2.38-4.13-4.97.34-10.93 6.8-9.06 20.9-7.16 20.9 4.6zm-1 0c0-5.3-2.87-8.55-7.32-9.16-4.23-.57-8.99 1.44-11.78 5.16-4.15 5.54-4.1 7.44-.64 9.47.44.25.93.51 1.59.85l1.87.93c3.34 1.67 7.36 2.44 10.42 1.74 3.73-.86 5.86-3.74 5.86-9zM387 530.3c0-12.8 2.44-16.74 18.48-29.77a56.8 56.8 0 0 1 7.61-5.2c2.6-1.5 5.33-2.82 8.5-4.18 1.24-.53 2.48-1.05 4.1-1.7l3.92-1.57c9.4-3.83 13.74-6.7 16.62-12.05 1.2-2.22 2.21-4.4 3.23-6.83a148.57 148.57 0 0 0 1.54-3.84l.3-.74.56-1.44c3.2-8.02 6.05-12.08 12.7-16.5a35.26 35.26 0 0 0 4.96-4 46.36 46.36 0 0 0 3.88-4.29c.27-.34 2.55-3.2 3.2-3.98 3.48-4.15 6.51-5.9 11.51-5.9 3.08 0 5.62-.63 9.57-2.1 5.42-2.02 6.53-2.34 8.96-2.2 2.53.13 4.85 1.26 7.18 3.59 1.3 1.3 5.55 5.83 6.52 6.78 5.06 5 9.44 6.92 17.77 6.92a197.5 197.5 0 0 1 12.08.45c15.93.87 21.94.57 25.28-2.21 6.91-5.77 11.64-2.73 11.64 7.76 0 10.73-8.6 20-19 20-4.8 0-8.32 1.43-9.34 3.67-1.12 2.48.68 6.15 5.98 10.57 13.6 11.33 11.24 20.76-7.64 20.76a21.91 21.91 0 0 0-14.6 5.24c-3.28 2.71-5.8 5.86-9.85 11.82l-1.52 2.25c-3.1 4.57-5.01 7.1-7.32 9.4-6.21 6.21-9.3 7.64-13.05 6.89l-1-.23a10.82 10.82 0 0 0-2.66-.37c-1.6 0-2.41.67-8.18 6.22-4.85 4.67-8.07 6.78-11.82 6.78-1.33 0-3.46 1.15-6.45 3.45-1.27.98-2.68 2.14-4.5 3.7l-4.92 4.29a181.11 181.11 0 0 1-4.54 3.82c-9.33 7.56-15.63 10.2-20.21 6.52-2.7-2.15-4.14-4.51-4.63-7.26-.37-2.04-.26-3.63.29-7.3.87-5.85.65-8.42-1.83-11.6-2.32-2.98-2.96-3.22-3.77-2.39-.25.26-1.35 1.63-1.61 1.94-2.21 2.5-4.85 3.57-9 2.82-4.6-.84-5.57-4.11-4.72-10.09l.24-1.56c.6-3.66.68-4.93.25-5.8-.44-.86-1.9-.94-5.23.4l-.74.29c-13.78 5.54-15.26 6.09-19.43 6.67-6.03.84-9.31-1.6-9.31-7.9zm2 0c0 5 2.14 6.6 7.04 5.92 3.91-.55 5.43-1.1 18.95-6.55l.75-.3c4.17-1.66 6.7-1.54 7.76.58.71 1.43.62 2.76-.06 7l-.24 1.53c-.72 5.04-.06 7.27 3.09 7.84 3.43.62 5.38-.17 7.15-2.18.2-.23 1.34-1.66 1.68-2 1.9-1.96 3.82-1.25 6.78 2.55 2.9 3.74 3.17 6.77 2.22 13.12-1 6.75-.52 9.4 3.62 12.71 3.49 2.8 9.1.45 17.7-6.51 1.35-1.1 2.75-2.28 4.49-3.78l4.93-4.3c1.84-1.58 3.27-2.76 4.58-3.77 3.34-2.56 5.74-3.86 7.67-3.86 3.04 0 5.95-1.9 10.43-6.22l2.46-2.39c.94-.89 1.67-1.56 2.37-2.13 1.81-1.49 3.3-2.26 4.74-2.26 1.03 0 1.81.13 3.1.42.7.16.71.17.96.21 2.96.6 5.45-.55 11.23-6.33 2.2-2.2 4.06-4.65 7.09-9.11l1.52-2.25c4.15-6.11 6.76-9.37 10.22-12.24a23.9 23.9 0 0 1 15.88-5.7c16.87 0 18.62-7.01 6.36-17.23-5.9-4.92-8.12-9.41-6.52-12.93 1.42-3.12 5.67-4.84 11.16-4.84 9.25 0 17-8.34 17-18 0-8.94-2.88-10.79-8.36-6.23-3.94 3.28-9.98 3.59-26.67 2.68l-1.02-.06c-5.09-.27-7.99-.39-10.95-.39-8.88 0-13.76-2.14-19.18-7.5-1-.98-5.26-5.53-6.53-6.79-1.99-1.99-3.86-2.9-5.87-3-2.03-.12-3.06.18-8.15 2.07-4.15 1.55-6.9 2.22-10.27 2.22-4.33 0-6.84 1.46-9.98 5.2-.63.74-2.89 3.6-3.18 3.95a48.29 48.29 0 0 1-4.04 4.46 37.26 37.26 0 0 1-5.24 4.23c-6.26 4.17-8.9 7.91-11.95 15.58l-.57 1.43-.28.74a531.5 531.5 0 0 1-1.56 3.88 77.49 77.49 0 0 1-3.32 7c-3.16 5.88-7.82 8.97-17.63 12.96l-3.92 1.58c-1.6.64-2.84 1.15-4.05 1.67a79.2 79.2 0 0 0-8.3 4.08 54.8 54.8 0 0 0-7.35 5.02C391.12 514.78 389 518.21 389 530.31zm133.22-79.76c3.06 1.53 6.54 2.02 10.68 1.7 2.53-.2 4.91-.62 8.8-1.49 5.36-1.19 6.33-1.38 8.33-1.54 2.78-.23 4.82.17 6.29 1.4 1.58 1.31 1.96 2.72 1.26 4.22-.66 1.38-1.05 1.74-5.05 5.07-3.53 2.93-5.03 4.83-5.03 7.09 0 7.3 1.29 10.02 7.83 15.62 3.86 3.3 5.93 6.84 5.28 9.62-.75 3.25-4.96 5.02-12.61 5.02-7.18 0-12.7 4.61-20.03 14.68-.5.7-3.96 5.57-4.94 6.87a38.89 38.89 0 0 1-4.72 5.5c-1.06.98-2.09 1.7-3.1 2.15-2.85 1.26-5.05 1.57-9.83 1.74-7.66.27-10.87 1.45-14.98 7.1-1.58 2.17-3.11 4-4.68 5.6a42.87 42.87 0 0 1-8.65 6.69c-.15.08-10.69 6.19-14.8 8.83-3.76 2.42-6.45 2.04-8.22-.77-1.28-2.03-1.9-4.54-2.87-10.35-.84-5.08-1.27-7.08-2.06-8.93-.97-2.3-2.21-3.24-4.02-2.88-6.2 1.24-8.95 1.39-10.98.2-2.37-1.4-3.13-4.62-2.62-10.73.16-1.96-1.04-2.87-3.76-3.04-2.24-.13-4.9.2-9.94 1.12l-.69.12c-7.97 1.45-10.72 1.72-12.72.73-2.91-1.43-1.6-5.27 4.23-12.21 5.48-6.53 10.6-10.81 15.76-13.53 3.74-1.97 5.94-2.65 12.16-4.1 7.29-1.72 10.4-3.51 14.04-9.31 2.96-4.75 10.74-18.62 12.14-20.84 3.59-5.67 6.8-9.1 11.05-11.34 2.6-1.38 4.72-2.82 9.17-6.07l1.38-1.01c7.85-5.72 12.3-7.98 17.68-7.98 4.22 0 6.49 1.36 9.13 4.77.34.43 1.67 2.22 2 2.67.85 1.09 1.6 1.98 2.45 2.83a24.29 24.29 0 0 0 6.64 4.78zm-.44.9c-2.8-1.4-5-3.03-6.92-4.97-.87-.9-1.65-1.81-2.51-2.93-.35-.46-1.68-2.25-2.01-2.67-2.47-3.18-4.46-4.38-8.34-4.38-5.09 0-9.4 2.2-17.09 7.78l-1.38 1.01c-4.49 3.29-6.63 4.74-9.3 6.15-4.06 2.15-7.16 5.45-10.66 11-1.39 2.19-9.16 16.05-12.15 20.82-3.79 6.07-7.13 7.98-14.66 9.75-6.13 1.45-8.27 2.1-11.92 4.02-5.04 2.66-10.05 6.86-15.46 13.3-5.43 6.46-6.53 9.69-4.55 10.66 1.7.84 4.48.57 12.1-.81l.7-.13c5.12-.93 7.82-1.27 10.17-1.12 3.21.2 4.92 1.48 4.7 4.11-.48 5.76.2 8.64 2.13 9.78 1.73 1.02 4.34.88 10.27-.31 2.35-.47 4 .78 5.14 3.47.83 1.95 1.27 4 2.07 8.8l.06.36c.94 5.65 1.55 8.11 2.72 9.98 1.46 2.3 3.52 2.6 6.84.46 4.14-2.66 14.69-8.77 14.81-8.85a41.9 41.9 0 0 0 8.46-6.54 47.89 47.89 0 0 0 4.6-5.48c4.32-5.95 7.81-7.23 15.74-7.5 4.66-.17 6.76-.47 9.46-1.67.9-.4 1.85-1.06 2.84-1.96a38.03 38.03 0 0 0 4.6-5.36c.96-1.3 4.4-6.16 4.93-6.87 7.5-10.31 13.22-15.09 20.83-15.09 7.24 0 11.02-1.6 11.64-4.24.54-2.32-1.36-5.55-4.97-8.64-6.75-5.79-8.17-8.79-8.17-16.38 0-2.67 1.64-4.74 5.39-7.86 3.8-3.17 4.23-3.56 4.78-4.73.5-1.06.25-1.99-.99-3.03-2.23-1.85-4.72-1.65-13.76.36-3.93.87-6.35 1.3-8.94 1.5-4.3.34-7.97-.18-11.2-1.8zm-28-3.9c5.65-2.82 8.96-2.2 12.9 1.37.56.5 2.6 2.47 3.02 2.87 4.2 3.89 8.07 5.71 14.3 5.71 11.37 0 14 1.41 16.1 8.09.26.83 1.35 4.6 1.66 5.62.8 2.63 1.64 5.03 2.7 7.6 2.13 5.17 2.64 8.32 1.72 10.24-.77 1.61-2.1 2.18-5.37 2.79-2.32.43-2.8.53-3.85.85-1.85.58-3.35 1.4-4.6 2.66-1 1-2.02 2.13-3.31 3.66-.6.71-2.91 3.5-3.46 4.14-7.2 8.54-12.43 12.35-19.59 12.35-3.76 0-6.95 1.28-10.59 4-1.84 1.37-11.62 10.31-15.22 13.06a73.09 73.09 0 0 1-8.95 5.88c-4.58 2.54-7.35 3.22-8.98 2.23-1.32-.8-1.65-2.07-1.94-5.5a52.53 52.53 0 0 0-.16-1.81c-.54-4.73-2.24-6.86-7.16-6.86-7.11 0-8.85-1.23-9.73-5.41-.96-4.61-2.1-6.7-6.55-9.67-3.97-2.65-4.31-5.42-1.52-8.22 2-2 4.63-3.5 11.35-6.87 6.61-3.3 9.2-4.8 11.1-6.68a39.09 39.09 0 0 0 5.3-6.48c.98-1.5 1.83-3.04 2.88-5.13l2.12-4.3c.91-1.83 1.72-3.37 2.61-4.98 5.74-10.32 10.37-14.78 23.22-21.2zm-22.34 21.7c-.89 1.59-1.69 3.12-2.6 4.94l-2.11 4.3a52.9 52.9 0 0 1-2.94 5.23 40.08 40.08 0 0 1-5.44 6.63c-2 2-4.62 3.51-11.35 6.87-6.6 3.3-9.2 4.8-11.1 6.69-2.33 2.34-2.08 4.37 1.38 6.67 4.7 3.14 5.96 5.46 6.97 10.3.78 3.7 2.09 4.62 8.75 4.62 5.5 0 7.57 2.57 8.15 7.75.06.5.09.82.17 1.84.25 3.06.55 4.17 1.46 4.72 1.2.74 3.69.13 7.98-2.25a72.09 72.09 0 0 0 8.82-5.8c3.55-2.7 13.34-11.65 15.24-13.07 3.79-2.83 7.18-4.19 11.18-4.19 6.77 0 11.8-3.67 18.83-12l3.45-4.13a60.07 60.07 0 0 1 3.37-3.72 11.72 11.72 0 0 1 5.01-2.91c1.1-.34 1.6-.45 3.97-.89 2.95-.55 4.07-1.02 4.65-2.23.76-1.59.28-4.5-1.74-9.43a84.46 84.46 0 0 1-2.74-7.69c-.31-1.03-1.4-4.8-1.66-5.61-1.95-6.2-4.16-7.39-15.14-7.39-6.5 0-10.61-1.93-14.98-5.98-.44-.4-2.46-2.37-3.01-2.86-3.65-3.3-6.52-3.85-11.79-1.21-12.67 6.33-17.15 10.65-22.78 20.8zm55.86 11.93c-2.98 6.45-16.78 15.26-26.74 15.26-5.33 0-7.56-2.98-7.11-7.86.32-3.48 2.1-7.91 3.93-10.61l1.52-2.32a44.95 44.95 0 0 1 1.88-2.7c3.66-4.8 7.85-7.45 13.62-7.45 9.06 0 15.75 9.52 12.9 15.68zm-.9-.42c2.52-5.47-3.65-14.26-12-14.26-5.4 0-9.33 2.48-12.82 7.06-.6.8-1.17 1.6-1.85 2.64 0 0-1.2 1.87-1.52 2.33-1.74 2.57-3.46 6.85-3.77 10.14-.4 4.33 1.43 6.77 6.12 6.77 9.57 0 23.02-8.58 25.83-14.68zm-69.67 20.74c2.08.18 4.44.81 5.88 1.8 2.12 1.47 2.2 3.6-.26 6.05-5.14 5.15-12.85 4.34-12.85-1.35 0-4.66 3.14-6.84 7.23-6.5zm-.09 1c-3.56-.3-6.14 1.5-6.14 5.5 0 4.58 6.53 5.26 11.15.65 2.03-2.04 1.98-3.43.4-4.52-1.27-.88-3.48-1.47-5.4-1.63zm29.59-225.95c4.64 2.35 17.27 8.24 19.39 9.43a24.14 24.14 0 0 1 7.05 5.64 45.03 45.03 0 0 1 3.75 5.2c2.4 3.78.04 7.66-6.2 11.63-4.97 3.16-12.18 6.3-21.95 9.82-4.84 1.74-19.63 6.68-21.1 7.2-6.59 2.33-14.85.1-25.14-5.86-3.93-2.27-8-5-12.94-8.54-2.23-1.61-9.5-6.99-10.7-7.85a81.21 81.21 0 0 0-8.63-5.7c-4.82-2.6-4.45-6.64.17-12.13 3.27-3.88 4.17-4.67 18.1-16.33a230.2 230.2 0 0 0 8.89-7.74 95.2 95.2 0 0 0 4.72-4.66c5.08-5.43 9.8-6.49 14.97-3.92 2.24 1.1 4.53 2.85 7.43 5.52 1.48 1.37 6.94 6.72 7.98 7.7 5.2 4.91 9.46 8.2 14.2 10.6zm-.46.9c-4.85-2.45-9.18-5.79-14.44-10.76-1.05-1-6.5-6.34-7.97-7.69-2.83-2.61-5.06-4.3-7.2-5.37-4.75-2.36-9-1.4-13.8 3.71a96.18 96.18 0 0 1-4.76 4.71c-2.48 2.3-5.16 4.62-8.92 7.77-13.86 11.6-14.77 12.4-17.98 16.21-4.28 5.08-4.58 8.4-.46 10.61 2.23 1.2 4.9 2.99 8.74 5.77 1.2.87 8.47 6.24 10.7 7.85a154.8 154.8 0 0 0 12.85 8.49c10.06 5.82 18.07 7.98 24.3 5.78 1.48-.52 16.27-5.47 21.1-7.2 9.7-3.5 16.86-6.61 21.75-9.72 5.84-3.71 7.9-7.1 5.9-10.26a44.09 44.09 0 0 0-3.67-5.08 23.16 23.16 0 0 0-6.78-5.42c-2.08-1.16-14.68-7.05-19.36-9.4zm-38.83 8.05c3.11-.37 5.7-.13 8.4.7 2.15.66 2.74.93 8.64 3.77 4.75 2.29 8.39 3.86 13.19 5.56 8.38 2.97 11.32 6.23 8.83 9.76-2.08 2.94-8.04 5.92-17.84 9.18-8.45 2.82-15.48 2.35-21.43-.9-4.65-2.55-8.33-6.5-12.15-12.3-2.9-4.41-2.73-8.2.16-11.06 2.48-2.45 6.87-4.07 12.2-4.7zm.12 1c-5.13.6-9.33 2.16-11.62 4.42-2.53 2.5-2.68 5.77-.02 9.8 3.73 5.68 7.3 9.51 11.8 11.97 5.7 3.11 12.43 3.57 20.62.84 9.59-3.2 15.44-6.12 17.34-8.82 1.94-2.75-.5-5.45-8.35-8.24-4.84-1.72-8.5-3.3-13.28-5.6-5.84-2.81-6.42-3.07-8.5-3.71a18.42 18.42 0 0 0-8-.66zM202.5 500.38c0 4.78-1.45 7.56-4.43 8.93-2.29 1.05-4.55 1.23-10.79 1.2l-1.78-.01c-9.19 0-17-7.65-17-15.5 0-7.59 10.6-10.51 19.74-5.44 2.78 1.55 4.21 1.94 8.57 2.75 4.44.83 5.69 2.27 5.69 8.07zm-1 0c0-5.3-.9-6.34-4.88-7.08-4.45-.83-5.96-1.25-8.86-2.86-8.57-4.76-18.26-2.1-18.26 4.56 0 7.3 7.36 14.5 16 14.5h1.79c6.06.04 8.26-.14 10.36-1.1 2.6-1.2 3.85-3.6 3.85-8.02zm33.33-117.85c3.71-1.31 8.7-2.7 16.1-4.55 2.58-.65 16.53-4.04 20.56-5.05 19.59-4.93 31.55-8.9 38.23-13.35 14.93-9.95 36.87-33.88 43.83-47.8 2.25-4.5 4.65-6.38 7.68-6.25 1.26.06 2.61.45 4.32 1.2a50.81 50.81 0 0 1 3.54 1.7l1.26.63c4.78 2.34 8.38 3.44 12.65 3.44 7.2 0 10.01 3.07 8.35 7.91-1.4 4.06-5.92 8.91-11.1 12.02-8.3 4.98-11.75 17.3-11.75 33.57 0 3.59-1.37 6.28-3.98 8.36-1.98 1.58-4.2 2.6-8.47 4.16l-1.02.37c-4.85 1.75-6.98 2.77-8.68 4.46-5.09 5.1-12.54 7.15-20.35 7.15-1.38 0-2.47.92-3.99 3.1-.29.41-1.32 1.95-1.47 2.18-2.68 3.92-4.93 5.72-8.54 5.72-7.84 0-10.74.93-21.76 6.94-5.18 2.82-8.8 3.58-14.66 3.68-.26 0-.47 0-.92.02-4.82.06-7.12.3-10.51 1.34a73.43 73.43 0 0 0-8.89 3.56c-2.17 1-10.53 5.01-10.23 4.87-7.79 3.7-13.32 5.98-18.9 7.57-12.41 3.55-18.58 2.24-27.42-4.07-2.58-1.85-2.72-4.43-.83-7.62 1.45-2.45 3.9-5.09 8.08-8.97l1.78-1.64c3.92-3.6 4.48-4.11 5.9-5.53 2.32-2.32 3.12-3.5 5.48-7.63 1.93-3.36 3.37-5.11 6.27-7.06 2.3-1.54 5.34-2.98 9.44-4.43zm.34.94c-4.03 1.42-7 2.83-9.22 4.32-2.75 1.85-4.1 3.49-5.96 6.73-2.4 4.2-3.24 5.44-5.64 7.83-1.43 1.44-2 1.96-5.94 5.57l-1.77 1.63c-4.1 3.82-6.52 6.41-7.9 8.75-1.65 2.79-1.54 4.8.55 6.3 8.6 6.14 14.46 7.38 26.57 3.92 5.5-1.57 11-3.84 18.74-7.51-.3.14 8.06-3.88 10.24-4.88a74.3 74.3 0 0 1 9.01-3.6c3.51-1.09 5.89-1.33 10.8-1.4h.91c5.72-.1 9.18-.83 14.2-3.57 11.16-6.08 14.2-7.06 22.24-7.06 3.19 0 5.2-1.6 7.71-5.28l1.48-2.2c1.7-2.43 3-3.52 4.81-3.52 7.57 0 14.78-2 19.65-6.85 1.83-1.84 4.04-2.9 9.04-4.7l1.02-.37c8.6-3.13 11.79-5.67 11.79-11.58 0-16.6 3.53-29.2 12.24-34.43 5-3 9.35-7.67 10.66-11.48 1.42-4.13-.83-6.59-7.4-6.59-4.45 0-8.19-1.14-13.09-3.54-7.52-3.67-6.78-3.34-8.72-3.43-2.58-.1-4.65 1.52-6.74 5.7-7.04 14.07-29.1 38.14-44.17 48.19-6.81 4.54-18.84 8.52-38.55 13.48-4.03 1.02-17.98 4.4-20.56 5.05-7.37 1.84-12.33 3.23-16 4.52zM252 387.5c2.08 0 4-.2 7.25-.69 5.22-.77 6.64-.9 8.46-.5 2.52.56 3.79 2.35 3.79 5.69 0 4.05-2.27 7.29-6.62 10.11-3.24 2.1-6.53 3.53-14.15 6.4l-.27.1-2.28.86c-3.04 1.16-5.27 2.52-9.33 5.43l-.8.57c-8.19 5.88-13.35 8.03-23.05 8.03-4.98 0-6.88-2.03-5.75-5.62.87-2.81 3.58-6.56 7.8-11.13 1.26-1.37 2.64-2.8 4.15-4.3 3.17-3.14 11.25-10.61 11.45-10.8.46-.47.93-.89 1.4-1.26 3.38-2.71 5.77-3.08 14.18-2.93 1.65.03 2.63.04 3.77.04zm0 1c-1.15 0-2.13-.01-3.79-.04-8.18-.14-10.4.2-13.54 2.71-.44.35-.88.74-1.32 1.18-.2.21-8.3 7.69-11.45 10.82a134.6 134.6 0 0 0-4.12 4.26c-4.12 4.47-6.76 8.12-7.58 10.75-.9 2.88.45 4.32 4.8 4.32 9.46 0 14.44-2.07 22.46-7.84l.8-.57c4.13-2.96 6.42-4.36 9.56-5.56l2.3-.86.25-.1c7.55-2.84 10.8-4.25 13.97-6.3 4.08-2.65 6.16-5.6 6.16-9.27 0-2.89-.97-4.26-3-4.7-1.65-.37-3.05-.25-8.1.5-3.3.5-5.26.7-7.4.7zm112.47-45.34c-1.88 5.44-1.98 6.76-.98 12.76 1.18 7.06-1.38 16.58-5.49 16.58a16.89 16.89 0 0 0-1.51.07l-.64.04c-2.86.18-4.83.17-6.94-.17-6.55-1.06-10.41-5.14-10.41-13.44 0-13.9 2.14-19.69 8.13-26.33a21.9 21.9 0 0 0 2.52-3.75c.59-1.03 2.78-5.13 2.72-5.01 4.44-8.14 7.71-11.53 12.25-10.4 1.17.3 2.2.77 3.58 1.59l1.39.84a20 20 0 0 0 3.1 1.6c.7.27 1.8.32 4.75.26l.72-.01c3.16-.05 4.78.08 5.83.66 1.61.89 1.2 2.56-1.14 4.9a215.9 215.9 0 0 1-3.86 3.76c-10.6 10.1-12.75 12.4-14.02 16.05zm-.94-.32c1.34-3.9 3.46-6.17 14.27-16.46 1.55-1.47 2.73-2.62 3.85-3.73 1.94-1.95 2.17-2.88 1.35-3.33-.82-.45-2.37-.58-5.32-.53l-.72.01c-3.14.06-4.26.02-5.14-.34-1.06-.41-1.97-.9-3.25-1.67l-1.38-.83a12.1 12.1 0 0 0-3.31-1.47c-3.88-.97-6.92 2.17-11.13 9.9.07-.13-2.14 3.98-2.73 5.02a22.71 22.71 0 0 1-2.65 3.92c-5.81 6.47-7.87 12-7.87 25.67 0 7.79 3.48 11.47 9.57 12.45 2.01.33 3.92.34 6.71.16a371.33 371.33 0 0 0 1.23-.07c.42-.03.73-.04.99-.04 3.2 0 5.6-8.9 4.5-15.42-1.02-6.16-.91-7.64 1.03-13.24zm-9.26 12.42c.58.52 2.5 1.9 2.55 1.93 1.96 1.57 2.04 3.31.01 6.36-3.74 5.64-8.83 3.09-8.83-4.55 0-3.81.51-5.67 2.07-6.02 1.18-.26 2 .3 4.2 2.28zm-1.34 1.48c-1.5-1.35-2.23-1.85-2.43-1.8-.17.03-.5 1.23-.5 4.06 0 5.87 2.67 7.21 5.17 3.45 1.5-2.26 1.47-2.84.4-3.7.03.03-1.95-1.4-2.64-2zm222.9-130.19c2.2-1.1 3.67-1.66 5.88-2.36l.28-.09a48.92 48.92 0 0 0 8.79-3.55c4.17-2.08 6.35-1.88 6.96.84.44 2 .2 4.01-1.25 12.7-2.27 13.62-9.16 26.14-21.17 36.3-4.3 3.63-7.41 4.39-9.75 2.44-1.88-1.57-3.1-4.57-4.61-10.48-.3-1.15-1.43-5.83-1.72-6.96a114.18 114.18 0 0 0-2.71-9.22c-2.4-6.82-3.03-10.78-2.1-12.94.77-1.83 2.08-2.24 5.6-2.45 1.49-.09 2.09-.14 2.97-.28l1.95-.33c.72-.12 1.22-.2 1.68-.29 1.1-.2 1.92-.38 2.71-.6 1.7-.49 3.42-1.2 6.49-2.73zm.44.9c-3.11 1.54-4.88 2.29-6.65 2.79-.84.23-1.69.42-2.81.63a108.77 108.77 0 0 1-3.81.63c-.77.13-1.39.19-2.92.28-3.13.18-4.17.51-4.74 1.85-.78 1.84-.2 5.62 2.13 12.2a115.12 115.12 0 0 1 2.74 9.31l1.72 6.96c1.46 5.7 2.62 8.58 4.28 9.96 1.87 1.56 4.49.93 8.47-2.44 11.82-10 18.6-22.3 20.83-35.7 1.4-8.45 1.65-10.51 1.25-12.31-.41-1.87-1.86-2-5.54-.16a49.87 49.87 0 0 1-8.93 3.6l-.28.1a35.4 35.4 0 0 0-5.74 2.3zm-4.5 6.58c1.37-.32 2.5-.75 3.9-1.42.35-.18 2.57-1.31 3.32-1.67 1.5-.71 2.97-1.31 4.7-1.89 2.7-.9 4.64-.77 5.88.4.98.94 1.34 2.26 1.41 4.18.02.4.02.7.02 1.37 0 5.63-4.63 16.88-11.34 22.75-4.34 3.8-7.31 4.67-9.92 2.52-2.06-1.7-3.5-4.65-6.67-12.91-1.86-4.83-2.05-8.1-.68-10.2 1.12-1.7 2.9-2.36 5.83-2.7l1.26-.12c1.19-.12 1.75-.19 2.3-.31zm-2.1 2.3l-1.22.12c-2.4.27-3.7.76-4.39 1.81-.93 1.43-.78 4.1.87 8.38 3.02 7.84 4.41 10.71 6.08 12.09 1.63 1.34 3.64.75 7.33-2.48C584.6 250.77 589 240.08 589 235c0-.64 0-.93-.02-1.29-.05-1.44-.3-2.33-.79-2.8-.6-.57-1.8-.65-3.87.04a37.95 37.95 0 0 0-4.47 1.8c-.72.34-2.93 1.47-3.32 1.66a19.54 19.54 0 0 1-4.3 1.56c-.66.16-1.28.24-2.56.36zm-227.73-88.98c-1.59 4.3-3.54 7.25-7.14 11.4l-2.6 2.97a67.02 67.02 0 0 0-2.63 3.23 46.4 46.4 0 0 0-4.68 7.5c-2.85 5.7-7.14 10.18-12.85 13.89-4.25 2.76-8.25 4.62-15.67 7.59-11.01 4.4-16.43 1.26-27.22-16.4-2.86-4.69-8.8-8.63-17.98-12.66-3-1.33-12.88-5.24-14.43-5.92-4.96-2.18-7.04-3.72-6.42-5.85.67-2.32 5.3-4.05 15.48-6.08 16.63-3.32 26.93-3.82 39.93-3.02 7.9.49 9.67.5 12.74-.26 1.99-.48 3.92-1.3 6-2.6l2.79-1.71c9.86-6.14 12.94-7.96 17.3-9.9 6.03-2.71 10.57-3.32 13.94-1.4 7.2 4.12 7.68 7.7 3.44 19.22zm-1.88-.7c3.95-10.7 3.6-13.26-2.56-16.78-2.66-1.52-6.62-.99-12.12 1.48-4.24 1.9-7.3 3.7-17.07 9.77l-2.79 1.73a22.6 22.6 0 0 1-6.57 2.84c-3.36.81-5.22.8-13.34.3-12.84-.78-22.97-.29-39.41 3-4.9.97-8.45 1.88-10.79 2.75-2.03.76-3.04 1.45-3.17 1.91-.16.57 1.48 1.79 5.3 3.46 1.5.67 11.39 4.58 14.44 5.93 9.52 4.19 15.74 8.3 18.87 13.44 10.35 16.93 14.87 19.56 24.78 15.6 7.3-2.93 11.21-4.75 15.33-7.42 5.42-3.53 9.47-7.75 12.15-13.1 1.44-2.9 3.02-5.4 4.86-7.82a68.95 68.95 0 0 1 2.72-3.33l2.6-2.97c3.46-3.99 5.28-6.75 6.77-10.79zm-6.64-.39c-7.94 12.8-18.53 21.75-33.3 25.23-7.82 1.83-12.47-.79-13.12-5.93-.55-4.45 2.29-9.06 6-9.06 3.02 0 5.6-1.68 15.38-9.16 1.47-1.12 2.57-1.96 3.66-2.74 4.4-3.2 7.77-5.17 10.82-6.08 5.57-1.67 9.33-2.15 11.35-1.22 2.5 1.14 2.22 4.13-.79 8.96zm-.84-.52c2.72-4.4 2.94-6.74 1.21-7.53-1.71-.79-5.32-.33-10.65 1.27-2.9.87-6.2 2.79-10.51 5.92-1.08.79-2.18 1.62-3.65 2.74-10.08 7.72-12.62 9.36-15.98 9.36-3.02 0-5.5 4.02-5 7.94.56 4.5 4.62 6.78 11.89 5.07 14.48-3.4 24.86-12.18 32.69-24.77zM461.17 33.53c13.88 4.96 20.75 4.96 31.62.01 3.02-1.37 5.47-2.94 11-6.82 5.57-3.92 8.05-5.51 11.14-6.92 4.14-1.88 7.78-2.38 11.22-1.28 3.92 1.26 6.2 12.3 6.78 28.45.5 14.2-.52 28.93-2.46 34.2-1.82 4.93-5.86 8.17-11.51 10.02A41.7 41.7 0 0 1 506 93.01c-5.79 0-9 2.4-12.2 7.64-.37.59-1.55 2.6-1.71 2.87-1.75 2.9-3.05 4.33-4.93 4.95-.94.32-2.07.83-3.87 1.74l-2.43 1.23c-1.03.53-1.87.94-2.7 1.34-6.43 3.1-11.73 4.72-17.16 4.72-5.71 0-10.04 2.09-14.02 5.92-1.16 1.11-4.2 4.53-4.63 4.94-2.54 2.44-5.93 4.24-10.85 6.1-1.4.52-5.98 2.13-6.25 2.22l-2.06.78c-.89.36-1.78.63-2.7.81-5.55 1.14-11.14-.54-17.98-4.42-1.27-.73-5.13-3.06-5.76-3.42-2.05-1.16-4.12-1.53-9.09-1.9l-1.73-.15c-4.78-.4-7.68-1.14-10.22-2.97-5-3.61-6.77-7.76-5.65-12.33 1.33-5.42 6.5-11.02 14.85-17.28a169.2 169.2 0 0 1 6.5-4.61c-.33.23 4.33-2.92 5.3-3.6 2.73-1.91 4.8-3.9 12.75-12.04l1.09-1.1c3.49-3.56 5.89-5.89 8.12-7.83 2.9-2.5 4.72-5.95 7.5-13.05l.63-1.61c2.7-6.92 4.28-10 6.87-12.33 1.42-1.28 6.68-6.54 7.93-7.5 3.98-3 8.01-2.73 19.57 1.4zm-.34.94c-11.26-4.02-15-4.28-18.62-1.53-1.19.9-6.4 6.11-7.88 7.43-2.42 2.18-3.96 5.19-6.6 11.95l-.63 1.61c-2.83 7.26-4.72 10.8-7.77 13.45a141.85 141.85 0 0 0-9.16 8.87c-8.02 8.2-10.08 10.2-12.88 12.16-.99.69-5.65 3.84-5.31 3.6-2.5 1.71-4.52 3.13-6.47 4.59-8.17 6.13-13.23 11.6-14.48 16.72-1.02 4.15.58 7.9 5.26 11.27 2.36 1.7 5.11 2.4 9.72 2.8l1.73.13c5.12.4 7.28.78 9.5 2.05.65.36 4.5 2.7 5.76 3.4 6.66 3.78 12.04 5.4 17.29 4.32.86-.17 1.7-.42 2.52-.75a67 67 0 0 1 2.1-.8c.28-.1 4.86-1.7 6.24-2.22 4.8-1.8 8.08-3.56 10.5-5.88.4-.38 3.44-3.8 4.63-4.94 4.16-4 8.72-6.2 14.72-6.2 5.25 0 10.42-1.59 16.73-4.62.82-.4 1.65-.8 2.68-1.33.12-.06 1.93-.99 2.43-1.23 1.84-.93 3-1.46 4-1.8 1.6-.52 2.76-1.82 4.39-4.52l1.7-2.88c3.39-5.5 6.87-8.11 13.07-8.11 4.45 0 8.73-.49 12.64-1.77 5.4-1.76 9.2-4.8 10.9-9.41 1.87-5.11 2.9-19.75 2.39-33.83-.56-15.53-2.81-26.48-6.08-27.52-3.18-1.02-6.57-.55-10.5 1.23-3.02 1.37-5.47 2.94-11 6.83-5.57 3.92-8.05 5.5-11.14 6.92-11.13 5.05-18.26 5.05-32.38.01zM475 55c5.38 0 7.55-.21 9.72-.96 1.26-.43 9.95-4.8 14.88-6.96 1.9-.82 3.56-2.44 6.6-6.04 2.56-3.04 3.19-3.75 4.4-4.84 3.7-3.35 7.07-3.28 10.22 1.23 6.23 8.9 5.61 15.94.07 27.02a71.26 71.26 0 0 0-2.5 5.48c-.32.8-1 2.7-1.09 2.9-.17.45-.34.81-.54 1.17-.63 1.14-1.56 2.21-4.05 4.7-2.4 2.4-5.16 3.27-11.68 4.33-1.81.3-2.2.36-3 .51-6.02 1.1-9.6 2.69-12.24 6.07-3.57 4.59-7.9 7.48-14.98 10.74-.55.24-1.1.5-1.8.8l-1.78.8a60.08 60.08 0 0 0-7.7 3.9c-2.57 1.6-4.79 2.35-9.42 3.46-8.58 2.06-12.28 3.76-17.37 9.36-5.12 5.64-10.17 7.64-16.63 6.7-5.36-.79-10.63-3.01-23.56-9.48-6.3-3.15-6.43-7.78-1.5-13.56 3.38-3.94 3.52-4.06 19.4-16.44 8.12-6.33 12.97-10.57 16.63-14.88 2.53-2.98 4.2-5.73 4.96-8.3 5.5-18.3 12.5-21.98 22.78-15.56 1.95 1.22 6.61 4.55 7.18 4.9 3.36 2.15 6.52 2.95 13 2.95zm0 2c-6.84 0-10.37-.89-14.08-3.26-.63-.4-5.27-3.71-7.16-4.9-9.05-5.65-14.66-2.7-19.8 14.45-.86 2.87-2.67 5.85-5.35 9.01-3.78 4.45-8.7 8.75-16.94 15.17-15.66 12.21-15.86 12.38-19.1 16.16-4.17 4.9-4.09 8 .88 10.48 12.71 6.35 17.89 8.54 22.94 9.28 5.78.84 10.18-.9 14.87-6.06 5.42-5.96 9.45-7.82 18.38-9.96 4.43-1.07 6.5-1.76 8.83-3.22a61.7 61.7 0 0 1 7.94-4.02l1.78-.8 1.78-.8c6.82-3.13 10.91-5.87 14.24-10.14 3-3.87 7-5.64 13.46-6.82.83-.15 1.21-.21 3.04-.51 6.1-1 8.6-1.78 10.58-3.77 2.36-2.36 3.21-3.34 3.72-4.26.15-.27.29-.56.44-.94.06-.15.75-2.06 1.09-2.9.64-1.6 1.45-3.4 2.57-5.64 5.24-10.49 5.8-16.8.07-24.98-2.4-3.44-4.37-3.48-7.24-.89-1.11 1-1.73 1.7-4.22 4.65-3.24 3.85-5.04 5.59-7.32 6.59-4.82 2.1-13.62 6.53-15.03 7.01-2.44.84-4.79 1.07-10.37 1.07zm-12.7 8.6c5.47 3.9 10.34 3.72 18.23.88 5.39-1.94 5.92-2.1 7.7-2.1 2.5-.01 4.21 1.36 5.24 4.46 1.66 4.98-2.32 8.52-12.3 12.68-2.7 1.13-16.25 6.18-20 7.73-7.86 3.24-13.93 6.42-18.87 10.15-13.02 9.84-18.36 11.93-23.71 9.68a24.67 24.67 0 0 1-3.62-1.98l-1.99-1.28a90.4 90.4 0 0 0-2.24-1.4c-3.33-2-2.82-4.28.85-7.34 1.35-1.13 10.66-7.61 13.53-9.91 7.1-5.69 11.91-11.47 14.41-18.34 3.07-8.45 4.89-12.1 6.8-13.39 1.73-1.16 3.36-.53 6.18 1.9.63.56 3.4 3.08 4.11 3.7 1.93 1.7 3.71 3.15 5.67 4.55zm-.6.8c-1.98-1.42-3.79-2.88-5.74-4.6-.73-.64-3.48-3.16-4.1-3.7-2.5-2.16-3.75-2.65-4.97-1.83-1.66 1.11-3.44 4.7-6.42 12.9-2.57 7.07-7.5 12.99-14.72 18.78-2.91 2.33-12.21 8.8-13.52 9.9-3.22 2.68-3.56 4.17-.97 5.72l2.26 1.4 1.99 1.28c1.47.93 2.48 1.5 3.47 1.91 4.9 2.07 9.96.07 22.72-9.56 5.02-3.79 11.15-7 19.1-10.28 3.76-1.55 17.3-6.6 20-7.72 9.5-3.97 13.14-7.2 11.73-11.44-.9-2.71-2.25-3.8-4.3-3.79-1.6 0-2.15.17-7.36 2.05-8.17 2.94-13.34 3.14-19.16-1.01z'%3E%3C/path%3E%3C/svg%3E"); -} \ No newline at end of file + height: 100%; +} diff --git a/frontend/src/App.js b/frontend/src/App.js index eacc7108..83d61bdf 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -1,35 +1,36 @@ -import './App.css'; -import MainPage from './components/main-page/MainPage'; -import AuthForm from './components/auth/login/auth'; -import { Routes, Route } from 'react-router-dom'; -import Header from './components/header/Header'; -import NotFound from './components/not-found/NotFound'; -import RegisterForm from './components/auth/register/RegisterForm'; -import Garden from './components/main-page/Garden/Garden'; -import Contractor from './components/main-page/Contractor/Contractor'; -import License from './components/main-page/License/License'; -import About from './components/main-page/About/about'; -import PrivateRoute from './components/auth/private-route/PrivateRoute'; +import "./App.css"; +import LandingPage from "./components/main-page/LandingPage/LandingPage"; +import AuthForm from "./components/auth/login/auth"; +import { Routes, Route } from "react-router-dom"; +import Header from "./components/header/Header"; +import NotFound from "./components/not-found/NotFound"; +import RegisterForm from "./components/auth/register/RegisterForm"; +import Garden from "./components/main-page/Garden/Garden"; +import Contractor from "./components/main-page/Contractor/Contractor"; +import About from "./components/main-page/About/about"; +import PrivateRoute from "./components/auth/private-route/PrivateRoute"; +import Basket from "./components/main-page/Basket/Basket"; function App() { return (
- } /> + } /> } /> } /> - - -
- - } /> - } /> - } /> - } /> - - - } /> + +
+ + } + > + } /> + } /> + } /> + } /> + } /> diff --git a/frontend/src/components/api/instance.js b/frontend/src/components/api/instance.js index 0a32a96c..7b238b5c 100644 --- a/frontend/src/components/api/instance.js +++ b/frontend/src/components/api/instance.js @@ -1,48 +1,57 @@ -import axios from 'axios'; +import axios from "axios"; const Instance = axios.create({ - baseURL: 'http://127.0.0.1:8000/api/v1', - timeout: 5000, - headers: { - 'Content-Type': 'application/json', - }, + baseURL: "http://127.0.0.1:8000/api/v1", + timeout: 15000, + headers: { + "Content-Type": "application/json", + }, }); Instance.interceptors.request.use( - (config) => { - const token = localStorage.getItem('accessToken'); - if (token) { - config.headers.Authorization = `Bearer ${token}`; - } - return config; - }, - (error) => Promise.reject(error) + (config) => { + const token = localStorage.getItem("accessToken"); + if (token) { + config.headers.Authorization = `Bearer ${token}`; + } + return config; + }, + (error) => Promise.reject(error) ); Instance.interceptors.response.use( - (response) => response, - async (error) => { - const originalRequest = error.config; - if ( - error.response.status === 401 && - !originalRequest._retry && - localStorage.getItem('refreshToken') - ) { - originalRequest._retry = true; - try { - const refreshToken = localStorage.getItem('refreshToken'); - const response = await axios.post('/token/refresh/', { refresh: refreshToken }); - localStorage.setItem('accessToken', response.data.access); - originalRequest.headers.Authorization = `Bearer ${response.data.access}`; - return axios(originalRequest); - } catch (refreshError) { - console.error('Token refresh failed:', refreshError); - // Handle refresh token failure (e.g., redirect to login) - } - } - return Promise.reject(error); + (response) => response, + async (error) => { + const originalRequest = error.config; + + if ( + error.response && + error.response.status === 401 && + !originalRequest._retry && + localStorage.getItem("refreshToken") && + !originalRequest.url.includes("refresh/") + ) { + originalRequest._retry = true; + + try { + const refreshToken = localStorage.getItem("refreshToken"); + const response = await Instance.post("/refresh/", { + refresh: refreshToken, + }); + + localStorage.setItem("accessToken", response.data.access); + originalRequest.headers.Authorization = `Bearer ${response.data.access}`; + + return axios(originalRequest); + } catch (refreshError) { + console.error("Token refresh failed:", refreshError); + + return Promise.reject(refreshError); + } } -); + return Promise.reject(error); + } +); export default Instance; diff --git a/frontend/src/components/auth/login/components/auth-style.css b/frontend/src/components/auth/login/components/auth-style.css index da8c8cd4..f6910c4a 100644 --- a/frontend/src/components/auth/login/components/auth-style.css +++ b/frontend/src/components/auth/login/components/auth-style.css @@ -1,35 +1,109 @@ .intro { - position: fixed; + position: fixed; top: 0; left: 0; right: 0; bottom: 0; height: 100vh; width: 100vw; - z-index: 9999; + z-index: 9999; + display: flex; + justify-content: center; + align-items: center; + background: radial-gradient(circle at center, #001c2c, #00070c); +} + +.auth-page-wrapper { + background: linear-gradient( + 315deg, + rgba(58, 80, 45, 1) 0%, + rgba(85, 110, 67, 1) 16%, + rgba(3, 106, 99, 1) 33%, + rgba(0, 48, 73, 1) 50%, + rgba(179, 57, 57, 1) 66%, + rgba(128, 0, 128, 1) 83%, + rgba(54, 69, 79, 1) 91%, + rgba(153, 92, 56, 1) 100% + ); + background-size: 400% 400%; /* Увеличиваем размер градиента для эффекта переливания */ + background-attachment: fixed; + animation: gradient 30s infinite ease; /* Анимация движения */ + width: 100%; + height: 100vh; display: flex; justify-content: center; align-items: center; - background: radial-gradient(circle at center, #001C2C, #00070C); } -/* Видео на заднем плане */ -.video { - overflow: hidden; - position: absolute; - width: 100vw; - height: 100vh; - top: 0; +.waves { + position: fixed; + bottom: 0; left: 0; - z-index: 1; /* Видео под содержимым */ + width: 200%; + height: 12em; + opacity: 0.8; + background: rgb(255, 255, 255 / 25%); + border-radius: 1000% 1000% 0 0; + z-index: 1; + transform: translate3d(0, 0, 0); + animation: wave 10s -3s linear infinite; } -/* Само видео */ -.background-video { - width: 100%; - height: 100%; - object-fit: cover; +.wave:nth-of-type(2) { + bottom: -1.25em; + animation: wave 18s linear reverse infinite; + opacity: 0.8; +} + +.wave:nth-of-type(3) { + bottom: -2.5em; + animation: wave 20s linear reverse infinite; + opacity: 0.9; +} + +@keyframes wave { + 2% { + transform: translateX(1); + } + 25% { + transform: translateX(-25%); + } + 50% { + transform: translateX(-50%); + } + 75% { + transform: translateX(-25%); + } + 100% { + transform: translateX(1); + } +} +@keyframes gradient { + 0% { + background-position: 0% 0%; + } + 50% { + background-position: 100% 100%; + } + 100% { + background-position: 0% 0%; + } +} +.welcome-show { + display: flex; + justify-content: center; + align-items: center; + height: 100px; +} + +.welcome-show h1 { + opacity: 0; + transition: opacity 1s ease-in-out; +} + +.welcome-show h1.show { + opacity: 1; } /* Обертка для содержимого внутри интро */ @@ -40,10 +114,8 @@ justify-content: center; align-items: center; width: 400px; - } - /* Стиль для формы */ .wrapper { position: absolute; @@ -59,7 +131,7 @@ .input-box { position: relative; margin-bottom: 20px; - width: 100%; + width: 100%; } /* Поле ввода */ @@ -73,14 +145,14 @@ background: transparent; z-index: 0; transition: background-color 0.3s ease; /* Плавный переход для затемнения */ - outline: none; + outline: none; } .input-box input:focus { background-color: rgba(0, 0, 0, 0.05); /* Легкое затемнение при фокусе */ } -.input-box label{ +.input-box label { position: absolute; top: 50%; left: 13%; @@ -88,12 +160,12 @@ color: #282528; font-size: 13px; pointer-events: none; - transition: .3s; + transition: 0.3s; } input:focus ~ label, -input:valid ~ label{ - top:0; +input:valid ~ label { + top: 0; font-size: 10px; padding: 0 10px; background-color: #dadcdd; @@ -120,21 +192,21 @@ input:valid ~ label{ border: none; border-radius: 5px; overflow: hidden; - background-color: #007BFF; /* Цвет фона */ + background-color: #007bff; /* Цвет фона */ cursor: pointer; transition: color 0.3s; &::before { - content: ''; + content: ""; position: absolute; top: 0; left: 0; width: 100%; height: 100%; - background-color: rgba(0, 0, 0, 0.3); - transform: translateX(-100%); - transition: transform 0.4s; - z-index: 0; + background-color: rgba(0, 0, 0, 0.3); + transform: translateX(-100%); + transition: transform 0.4s; + z-index: 0; border-radius: 5px; } @@ -147,8 +219,8 @@ input:valid ~ label{ } } - -.remember, .register-link { +.remember, +.register-link { font-size: 13px; display: flex; justify-content: space-between; @@ -157,7 +229,7 @@ input:valid ~ label{ } .register-link a { - color: #007BFF; + color: #007bff; } .register-link a:hover { diff --git a/frontend/src/components/auth/login/components/background.js b/frontend/src/components/auth/login/components/background.js index 967baa06..e2a4197c 100644 --- a/frontend/src/components/auth/login/components/background.js +++ b/frontend/src/components/auth/login/components/background.js @@ -1,20 +1,18 @@ -import React from 'react' -import './auth-style.css' -import Form from './form' +import React from "react"; +import "./auth-style.css"; +import Form from "./form"; export default function AuthFormBackgroundComponent() { return ( -
-
- Background GIF -
-
-
+
+
+
+
+
+
+ +
- ) + ); } diff --git a/frontend/src/components/auth/login/components/form.js b/frontend/src/components/auth/login/components/form.js index 7ab1e660..2d10bd05 100644 --- a/frontend/src/components/auth/login/components/form.js +++ b/frontend/src/components/auth/login/components/form.js @@ -1,82 +1,93 @@ -import React, { useState } from 'react'; -import { Link, Routes, Route, useNavigate } from 'react-router-dom'; -import axios from '../../../api/instance'; -import RegisterForm from '../../register/RegisterForm'; +import React, { useState } from "react"; +import { Link, Routes, Route, useNavigate } from "react-router-dom"; +import RegisterForm from "../../register/RegisterForm"; +import Instance from "../../../api/instance"; +import Welcome from "./welocme/Welcome"; +import { useNotification } from "../../../context/NotificationContext"; export default function Form() { - const [username, setUsername] = useState(''); - const [password, setPassword] = useState(''); + const [username, setUsername] = useState(""); + const [password, setPassword] = useState(""); const navigate = useNavigate(); + const { addNotification } = useNotification(); const handleSubmit = async (e) => { e.preventDefault(); try { - const response = await axios.post('/login/', { + localStorage.removeItem("accessToken"); + localStorage.removeItem("refreshToken"); + localStorage.removeItem("wallet_balance"); + localStorage.removeItem("user_id"); + const response = await Instance.post("/login/", { username, password, }); - localStorage.setItem('accessToken', response.data.access); - localStorage.setItem('refreshToken', response.data.refresh); - navigate('/navigate/garden'); + localStorage.setItem("accessToken", response.data.access); + localStorage.setItem("refreshToken", response.data.refresh); + localStorage.setItem("wallet_balance", response.data.wallet_balance); + localStorage.setItem("user_id", response.data.id); + navigate("/navigate/garden"); } catch (error) { - console.error('Login failed:', error); - // Handle error (e.g., display message to the user) + addNotification("Неверный логин или пароль", "error"); } }; const handleChangeName = (event) => { setUsername(event.target.value); - } + }; const handleChangePassword = (event) => { setPassword(event.target.value); - } + }; return ( -
+
-

Login

-
- - - text +
+
- -
- - +
+ + text - + className="user-icon-auth" + src={process.env.PUBLIC_URL + "/user.png"} + alt="text" + >
-
- - Forgot password? +
+ + + text
- -
-

Don't have an account? - Register + +

+

+ У Вас нет аккаунта? Регистрация

- } /> + } />
); diff --git a/frontend/src/components/auth/login/components/welocme/Welcome.js b/frontend/src/components/auth/login/components/welocme/Welcome.js new file mode 100644 index 00000000..a96d333e --- /dev/null +++ b/frontend/src/components/auth/login/components/welocme/Welcome.js @@ -0,0 +1,44 @@ +import React, { useState, useEffect } from "react"; + +export default function Welcome() { + // Массив с приветствиями + const greetings = [ + "Привет", // Русский + "Hello", // Английский + "Hola", // Испанский + "Bonjour", // Французский + "Ciao", // Итальянский + "こんにちは", // Японский + "안녕하세요", // Корейский + "Hallo", // Немецкий + "Olá", // Португальский + "Nǐ hǎo", // Китайский + ]; + + const [greeting, setGreeting] = useState(greetings[0]); + + const [isVisible, setIsVisible] = useState(false); + + useEffect(() => { + setIsVisible(true); + + const interval = setInterval(() => { + setIsVisible(false); + setTimeout(() => { + setGreeting((prevGreeting) => { + const currentIndex = greetings.indexOf(prevGreeting); + const nextIndex = (currentIndex + 1) % greetings.length; + return greetings[nextIndex]; + }); + setIsVisible(true); + }, 1000); + }, 3000); + + return () => clearInterval(interval); + }, []); + return ( + <> +

{greeting}

{" "} + + ); +} diff --git a/frontend/src/components/auth/logout/Logout.js b/frontend/src/components/auth/logout/Logout.js index 6fc9d2cc..80ade399 100644 --- a/frontend/src/components/auth/logout/Logout.js +++ b/frontend/src/components/auth/logout/Logout.js @@ -1,11 +1,27 @@ -import React from 'react' -import { Link } from 'react-router-dom'; +import React from "react"; +import { useNavigate } from "react-router-dom"; +import Instance from "../../api/instance"; +import {useBasket} from "../../context/BasketContext"; export default function Logout() { - return ( - - - - ) + const navigate = useNavigate(); + const {clearBasket} = useBasket(); + + const handleLogout = async () => { + try { + await Instance.post("/logout/"); + + localStorage.removeItem("accessToken"); + localStorage.removeItem("refreshToken"); + clearBasket(); + navigate("/"); + } catch (error) { + console.error("Ошибка при выходе:", error); + } + }; + + return ( + + ); } diff --git a/frontend/src/components/auth/private-route/PrivateRoute.js b/frontend/src/components/auth/private-route/PrivateRoute.js index da3f8c47..223971ad 100644 --- a/frontend/src/components/auth/private-route/PrivateRoute.js +++ b/frontend/src/components/auth/private-route/PrivateRoute.js @@ -1,17 +1,16 @@ -import React from 'react'; -import NotFound from '../../not-found/NotFound'; +import React from "react"; +import { Navigate } from "react-router-dom"; -// Функция, которая проверяет, авторизован ли пользователь const PrivateRoute = ({ children }) => { - const isAuthenticated = localStorage.getItem('accessToken'); // или другой механизм авторизации + const isAuthenticated = localStorage.getItem("accessToken"); // Проверка авторизации - // Если пользователь не авторизован, показываем страницу NotFound - if (!isAuthenticated) { - return ; - } + // Если пользователь не авторизован, перенаправляем на страницу 404 или на логин + if (!isAuthenticated) { + return ; + } - // Если авторизован, рендерим переданные дочерние компоненты - return children; + // Возвращаем дочерние элементы или вложенные маршруты через Outlet + return <>{children}; }; export default PrivateRoute; diff --git a/frontend/src/components/auth/register/RegisterForm.js b/frontend/src/components/auth/register/RegisterForm.js index 659faec2..6738db91 100644 --- a/frontend/src/components/auth/register/RegisterForm.js +++ b/frontend/src/components/auth/register/RegisterForm.js @@ -1,133 +1,151 @@ -import React, { useState } from 'react'; -import { Link, Routes, Route, useNavigate } from 'react-router-dom'; -import AuthForm from '../login/auth'; -import '../login/components/auth-style.css' -import axios from '../../api/instance'; -import Alert from '../alert/Alert'; +import React, { useState } from "react"; +import { Link, Routes, Route, useNavigate } from "react-router-dom"; +import AuthForm from "../login/auth"; +import "../login/components/auth-style.css"; +import Instance from "../../api/instance"; +import { useNotification } from "../../context/NotificationContext"; export default function RegisterForm() { - const [username, setUsername] = useState(''); - const [email, setEmail] = useState(''); - const [passwordFirst, setPasswordFirst] = useState(''); - const [passwordSecond, setPasswordSecond] = useState(''); - const [errorMessage, setErrorMessage] = useState(''); - - const navigate = useNavigate(); - - const handleSubmit = async (e) => { - e.preventDefault(); - - if (passwordFirst !== passwordSecond) { - setErrorMessage('Passwords do not match'); - setShowAlert(true); - return; + const [login, setLogin] = useState(""); + const [username, setUsername] = useState(""); + const [phone, setPhone] = useState(""); + const [passwordFirst, setPasswordFirst] = useState(""); + const [passwordSecond, setPasswordSecond] = useState(""); + const { addNotification } = useNotification(); + const navigate = useNavigate(); + + const handleSubmit = async (e) => { + e.preventDefault(); + + if (passwordFirst !== passwordSecond) { + addNotification("Passwords do not match", "warning"); + return; + } + + try { + await Instance.post("/register/", { + username: login, + full_name: username, + phone_number: phone, + password: passwordFirst, + }); + + navigate("/login"); + } catch (error) { + if (error.response && error.response.data) { + for (const [key, value] of Object.entries(error.response.data)) { + addNotification(`${value}`, "error"); } - - try { - const response = await axios.post('/register/', { - username, - passwordFirst, - email, - }); - localStorage.setItem('accessToken', response.data.access); - localStorage.setItem('refreshToken', response.data.refresh); - navigate('/login'); - } catch (error) { - console.error('Register failed:', error); - setErrorMessage('Registration failed. Please try again.'); - setShowAlert(true); - } - }; - - const handleChange = (setter) => (event) => { - setter(event.target.value); - setShowAlert(false); - }; - - const [showAlert, setShowAlert] = useState(false); - - - return ( -
-
+ } else { + addNotification("An error occurred. Please try again.", "error"); + } + } + }; + + const handleChange = (setter) => (event) => { + setter(event.target.value); + }; + + return ( +
+
+
+
+
+ +
+
+
+

Регистрация

+
+ + Background GIF +
+ +
+ -
- -
- -
- {showAlert && } - - - -

Register

-
- - - text -
- -
- - - text -
- -
- - - text - -
- -
- - - text - -
- - -
- ← Go back -
- - - - } /> - -
-
-
- ); + + text +
+ +
+ + + text +
+ +
+ + + text +
+ +
+ + + text +
+ + +
+ ← Вернуться назад +
+ + + + } /> + +
+
+
+
+ ); } diff --git a/frontend/src/components/card/Card.js b/frontend/src/components/card/Card.js index 5c9a248f..f259f531 100644 --- a/frontend/src/components/card/Card.js +++ b/frontend/src/components/card/Card.js @@ -1,9 +1,10 @@ -import React from 'react' -import './style-card.css' -import { useState, useEffect } from 'react' -import Modal from './modal/Modal' +import React from "react"; +import "./style-card.css"; +import { useState, useEffect } from "react"; +import Modal from "./modal/Modal"; + export default function Card(props) { - const [modalActive, setModalActive] = useState(false) + const [modalActive, setModalActive] = useState(false); const [isVisible, setIsVisible] = useState(false); useEffect(() => { @@ -16,14 +17,20 @@ export default function Card(props) { return ( <> -
setModalActive(true)}> - Placeholder +
setModalActive(true)} + > + Placeholder

{props.label}

{props.description}

- - + - ) + ); } diff --git a/frontend/src/components/context/BasketContext.js b/frontend/src/components/context/BasketContext.js new file mode 100644 index 00000000..824267a4 --- /dev/null +++ b/frontend/src/components/context/BasketContext.js @@ -0,0 +1,62 @@ +import React, {createContext, useState, useContext, useEffect} from "react"; +import {useNotification} from "./NotificationContext"; + +const BasketContext = createContext(); + +export const BasketProvider = ({children}) => { + const {addNotification} = useNotification(); + const loadBasketItems = () => { + const savedItems = localStorage.getItem("basketItems"); + return savedItems ? JSON.parse(savedItems) : []; + }; + + const [basketItems, setBasketItems] = useState(loadBasketItems); + + // Сохраняем корзину в localStorage при любом изменении состояния + useEffect(() => { + localStorage.setItem("basketItems", JSON.stringify(basketItems)); + }, [basketItems]); + + const addToBasket = (item) => { + const currentDate = new Date().toLocaleDateString("ru-RU"); + + setBasketItems((prevItems) => { + const exists = prevItems.some((i) => i.id === item.id); + if (exists) { + addNotification(`Объект ${item.name} уже в корзине`, "warning"); + + return prevItems.map((i) => + i.id === item.id ? {...i, dateAdded: currentDate} : i + ); + } + addNotification(`Объект ${item.name} добавлен в корзину`, "success") + return [...prevItems, {...item, dateAdded: currentDate}]; + }); + }; + + const removeFromBasket = (item) => { + setBasketItems((prevItems) => prevItems.filter((item) => item.id !== item.id)); + }; + + const totalItems = basketItems.length; + + const clearBasket = () => { + setBasketItems([]); + }; + + return ( + + {children} + + ); +}; + +export const useBasket = () => useContext(BasketContext); diff --git a/frontend/src/components/context/NotificationContext.jsx b/frontend/src/components/context/NotificationContext.jsx new file mode 100644 index 00000000..8ba0fab6 --- /dev/null +++ b/frontend/src/components/context/NotificationContext.jsx @@ -0,0 +1,95 @@ +import React, { createContext, useState, useContext } from "react"; + +const NotificationContext = createContext(); + +export const useNotification = () => { + return useContext(NotificationContext); +}; + +export const NotificationProvider = ({ children }) => { + const [notifications, setNotifications] = useState([]); + + const addNotification = (message, type = "info") => { + const id = Date.now(); + setNotifications((prev) => [ + ...prev, + { id, message, type, isVisible: false }, + ]); + + setTimeout(() => { + setNotifications((prev) => + prev.map((n) => + n.id === id ? { ...n, isVisible: true } : n + ) + ); + }, 10); // Задержка минимальная, чтобы сработала анимация + + setTimeout(() => { + setNotifications((prev) => + prev.map((n) => + n.id === id ? { ...n, isVisible: false } : n + ) + ); + }, 4500); + + setTimeout(() => { + removeNotification(id); + }, 5000); + }; + + const removeNotification = (id) => { + setNotifications((prev) => + prev.filter((notification) => notification.id !== id) + ); + }; + + return ( + + {children} + + + ); +}; + +const NotificationList = ({ notifications }) => { + return ( +
+ {notifications.map((notification) => ( +
+ {notification.message} +
+ ))} +
+ ); +}; + +const getColor = (type) => { + switch (type) { + case "success": + return "green"; + case "error": + return "red"; + case "warning": + return "orange"; + default: + return "blue"; + } +}; diff --git a/frontend/src/components/header/Header.js b/frontend/src/components/header/Header.js index 2d12c00b..ef3e3bd4 100644 --- a/frontend/src/components/header/Header.js +++ b/frontend/src/components/header/Header.js @@ -1,77 +1,113 @@ -import React, { useRef } from 'react'; -import { Routes, Route, Link, useLocation } from 'react-router-dom'; -import Garden from '../main-page/Garden/Garden'; -import About from '../main-page/About/about'; -import License from '../main-page/License/License'; -import Contractor from '../main-page/Contractor/Contractor'; +import React, { useRef, useState, useEffect } from "react"; +import { Routes, Route, Link, useLocation } from "react-router-dom"; +import Garden from "../main-page/Garden/Garden"; +import About from "../main-page/About/about"; +import Basket from "../main-page/Basket/Basket"; +import Contractor from "../main-page/Contractor/Contractor"; +import { useBasket } from "../context/BasketContext"; import { CSSTransition, SwitchTransition } from "react-transition-group"; -import '../main-page/style.css'; -import Logout from '../auth/logout/Logout'; +import "../main-page/style.css"; +import Logout from "../auth/logout/Logout"; + export default function Header() { - const location = useLocation(); + const location = useLocation(); + const { totalItems } = useBasket(); + const [showIndicator, setShowIndicator] = useState(false); + const [lastBasketCount, setLastBasketCount] = useState(0); + + const routes = [ + { path: "garden", Component: Garden }, + { path: "about", Component: About }, + { path: "license", Component: Basket }, + { path: "contractor", Component: Contractor }, + ]; - const routes = [ - { path: 'garden', Component: Garden }, - { path: 'about', Component: About }, - { path: 'license', Component: License }, - { path: 'contractor', Component: Contractor }, - ]; + const isActivePath = (path) => location.pathname === path; - const isActivePath = (path) => location.pathname === path; + useEffect(() => { + if (location.pathname === "/navigate/license") { + setLastBasketCount(totalItems); + setShowIndicator(false); + setTimeout(() => setShowIndicator(false), 300); // Удалить из DOM после завершения анимации + } else if (totalItems > lastBasketCount) { + setShowIndicator(true); + setTimeout(() => setShowIndicator(true), 0); // Добавить анимацию + } + }, [location.pathname, totalItems, lastBasketCount]); - // Create a ref for the transition - const transitionRef = useRef(null); + const transitionRef = useRef(null); - return ( - <> -
- Logo - - -
+ return ( +
+
+ Logo + + +
- - -
- - {routes.map(({ path, Component }) => ( - } /> - ))} - -
- - - - ); + + +
+ + {routes.map(({ path, Component }) => ( + } /> + ))} + +
+ + +
+ ); } diff --git a/frontend/src/components/main-page/About/about.js b/frontend/src/components/main-page/About/about.js index 55981e9b..df73ad7d 100644 --- a/frontend/src/components/main-page/About/about.js +++ b/frontend/src/components/main-page/About/about.js @@ -1,56 +1,55 @@ -import React from 'react' -import StudentCard from './student-card/StudentCard' +import React from "react"; +import StudentCard from "./student-card/StudentCard"; const listStudents = { - 'Денис': { - name: 'Денис', - ico: '', - link: 'https://github.com/Kseen715', - des: 'Автоматизация технологических процессов сборки, настройка и развёртывание программного обеспечения.', - subject: 'Девопс', - image: process.env.PUBLIC_URL + '/students/Денис.png', + Денис: { + name: "Денис", + ico: "", + link: "https://github.com/Kseen715", + des: "Автоматизация технологических процессов сборки, настройка и развёртывание программного обеспечения.", + subject: "Девопс", + image: process.env.PUBLIC_URL + "/students/Денис.png", }, - 'Леонид': { - name: 'Леонид', - ico: '', - link: 'https://github.com/o6ez9na', - des: 'Разработка клиентской части веб-сайта.', - subject: 'Фронтенд', - image: process.env.PUBLIC_URL + '/students/Леонид.png', - + Леонид: { + name: "Леонид", + ico: "", + link: "https://github.com/o6ez9na", + des: "Разработка клиентской части веб-сайта.", + subject: "Фронтенд", + image: process.env.PUBLIC_URL + "/students/Леонид.png", }, - 'Анастасия': { - name: 'Анастасия', - ico: '', - link: 'https://github.com/Nvnastya', - des: 'Разработка серверной части веб-сайта.', - subject: 'Бэкенд', - image: process.env.PUBLIC_URL + '/students/Анастасия.png', + Анастасия: { + name: "Анастасия", + ico: "", + link: "https://github.com/Nvnastya", + des: "Разработка серверной части веб-сайта.", + subject: "Бэкенд", + image: process.env.PUBLIC_URL + "/students/Анастасия.png", }, - 'Николай': { - name: 'Николай', - ico: '', - link: 'https://github.com/Kolan4ik2003', - des: 'Тестировщик, разработка серверной части веб-сайта.', - subject: 'Тесты', - image: process.env.PUBLIC_URL + '/students/Николай.png', - + Николай: { + name: "Николай", + ico: "", + link: "https://github.com/Kolan4ik2003", + des: "Тестировщик, разработка серверной части веб-сайта.", + subject: "Тесты", + image: process.env.PUBLIC_URL + "/students/Николай.png", + }, + Дарья: { + name: "Дарья", + ico: "", + link: "https://github.com/kotikgriga27", + des: "Формализации спецификаций, архитектуры, функциональных требований и эксплуатационных инструкций.", + subject: "Дизайнер", + image: process.env.PUBLIC_URL + "/students/Дарья.png", }, - 'Дарья': { - name: 'Дарья', - ico: '', - link: 'https://github.com/kotikgriga27', - des: 'Формализации спецификаций, архитектуры, функциональных требований и эксплуатационных инструкций для оптимизации разработки и эксплуатации программных систем; тестировщик.', - subject: '?????', - image: process.env.PUBLIC_URL + '/students/Дарья.png', - - } }; - export default function About() { return ( -
+
{Object.keys(listStudents).map((studentKey) => { const student = listStudents[studentKey]; return ( @@ -66,4 +65,4 @@ export default function About() { })}
); -} \ No newline at end of file +} diff --git a/frontend/src/components/main-page/About/student-card/student.css b/frontend/src/components/main-page/About/student-card/student.css index 667df6d2..6a484b31 100644 --- a/frontend/src/components/main-page/About/student-card/student.css +++ b/frontend/src/components/main-page/About/student-card/student.css @@ -1,18 +1,21 @@ .student-wrapper{ - width: 900px; - height: 145px; + width: 40vw; + height: 15vh; background-color: rgb(150, 194, 168, 0.5); padding: 10px; display: flex; + align-items: center; border-radius: 20px; color:bisque; + font-size: 1.5vh; font-weight: 500; box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); overflow: visible !important; } .student-img { - height: 120px; + position: absolute; + height: 140px; width: auto; transition: .5s all; filter: drop-shadow(0 0 4px rgba(0, 0, 0, 0.7)); @@ -27,27 +30,28 @@ .description-fix-pos{ position: relative; + font-size: 1.6vh; } .student-description{ - margin-left: 20px; + margin-left: 16vh; } .student-img:hover { filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.7)); - animation: sway 0.4s; /* Изменено на анимацию покачивания */ + animation: sway 0.4s infinite; } @keyframes sway { - 0% { transform: translateY(0); } - 10% { transform: translateY(-5px); } - 20% { transform: translateY(0); } - 30% { transform: translateY(5px); } - 40% { transform: translateY(0); } - 50% { transform: translateY(-5px); } - 60% { transform: translateY(0); } - 70% { transform: translateY(5px); } - 80% { transform: translateY(0); } - 90% { transform: translateY(-5px); } - 100% { transform: translateY(0); } + 0% { transform: translate(1px, 1px) rotate(0deg); } + 10% { transform: translate(-1px, -2px) rotate(-1deg); } + 20% { transform: translate(-3px, 0px) rotate(1deg); } + 30% { transform: translate(3px, 2px) rotate(0deg); } + 40% { transform: translate(1px, -1px) rotate(1deg); } + 50% { transform: translate(-1px, 2px) rotate(-1deg); } + 60% { transform: translate(-3px, 1px) rotate(0deg); } + 70% { transform: translate(3px, 1px) rotate(-1deg); } + 80% { transform: translate(-1px, -1px) rotate(1deg); } + 90% { transform: translate(1px, 2px) rotate(0deg); } + 100% { transform: translate(1px, -2px) rotate(-1deg); } } diff --git a/frontend/src/components/main-page/Basket/Basket.js b/frontend/src/components/main-page/Basket/Basket.js new file mode 100644 index 00000000..c3d9ecc0 --- /dev/null +++ b/frontend/src/components/main-page/Basket/Basket.js @@ -0,0 +1,37 @@ +import React from "react"; +import { useBasket } from "../../context/BasketContext"; +import Order from "./Order/Order"; +import "./basket.css"; +import { Context } from "../ui/counter/CounterContext"; + +export default function Basket() { + const { addToBasket, basketItems, removeFromBasket, removeOneFromBasket } = + useBasket(); + + return ( +
+ {basketItems.length === 0 ? ( +
Корзина пуста
+ ) : ( +
+ {basketItems.map((item) => ( + + + + ))} +
+ )} +
+ ); +} diff --git a/frontend/src/components/main-page/Basket/Order/Order.js b/frontend/src/components/main-page/Basket/Order/Order.js new file mode 100644 index 00000000..86006a0d --- /dev/null +++ b/frontend/src/components/main-page/Basket/Order/Order.js @@ -0,0 +1,186 @@ +import React, { useState, useEffect, useContext } from "react"; +import "./order.css"; +import PlantArea from "./PlantArea/PlantArea"; +import { CounterContext } from "../../ui/counter/CounterContext"; +import Counter from "../../ui/counter/Counter"; +import Instance from "../../../api/instance"; +import {useNotification} from "../../../context/NotificationContext"; + +function getDeclension(quantity, one, few, many) { + if (quantity % 10 === 1 && quantity % 100 !== 11) { + return one; + } else if ( + [2, 3, 4].includes(quantity % 10) && + ![12, 13, 14].includes(quantity % 100) + ) { + return few; + } else { + return many; + } +} + +export default function Order({ + id, + name, + price, + removeFromBasket, + date, + item, +}) { + const { count } = useContext(CounterContext); + const declension = getDeclension(count, "грядка", "грядки", "грядок"); + const [comment, setComment] = useState(" "); + const [selectedPlant, setSelectedPlant] = useState(null); // Состояние для выбранного растения + const [fertilize, setFertilization] = useState(false); + const {addNotification} = useNotification() + + function createOrder() { + Instance.post("order/", { + field: item.id, + beds_count: Number(count), + plant: selectedPlant.id, + comments: comment, + fertilize: fertilize, + }) + .then(() => { + removeFromBasket(id); // Удаляем элемент из корзины + addNotification("Заказ создан", "success"); // Добавляем уведомление + }) + .catch((err) => { + addNotification(err.response.data, "error"); // Показываем уведомление об ошибке + }); + } + + + const handleSetFertilizeFalse = () => { + setFertilization(false); + }; + + const handleSetFertilizeTrue = () => { + setFertilization(true); + }; + + useEffect(() => { + if (selectedPlant) { + console.log( + "Выбранное поле:", + item.id, + "Выбранное растение:", + selectedPlant.id, + "количество выбранных грядок:", + Number(count), + "Комментарий: ", + comment, + "Удобрять?", + fertilize + ); + } + }, [selectedPlant, count]); + function removeFromBasketToThis(item){ + addNotification(`Объект ${item.name} удален из корзины`, "warning") + removeFromBasket(item); + } + return ( +
+
+
+
+
+ Поле №{id}
+ {name} - {price} руб.
+ Свободных грядок: {item.count_free_beds} +
+
+
+ {" "} + {" "} +
+
+ +
+
Условия заказа
+ +
+
Дата заказа: {date}
+
+
+ Итог: {declension} +
+
+
+ Удобрять?{" "} +
+ + +
+
+
+ {selectedPlant ? ( +
Выбрано растение: {selectedPlant.name}
+ ) : ( + "Растение не выбрано" + )} +
+
+ Цена:{" "} + {item.price * Number(count) + 1000 + + (selectedPlant ? selectedPlant.price : 0)}{" "} + ₽ +
+
+ {selectedPlant ? ( + + ) : ( + "" + )} + +
+
+
+
+
+ ); +} diff --git a/frontend/src/components/main-page/Basket/Order/PlantArea/PlantArea.js b/frontend/src/components/main-page/Basket/Order/PlantArea/PlantArea.js new file mode 100644 index 00000000..e9e7cfff --- /dev/null +++ b/frontend/src/components/main-page/Basket/Order/PlantArea/PlantArea.js @@ -0,0 +1,71 @@ +import React, { useEffect, useState } from "react"; +import Instance from "../../../../api/instance"; +import "./plant-area.css"; + +function Plant({ plant, onClick }) { + return ( + + ); +} + +export default function PlantArea({ onPlantSelect }) { + const [data, setData] = useState([]); + const [filteredData, setFilteredData] = useState([]); + const [searchTerm, setSearchTerm] = useState(""); + + useEffect(() => { + const fetchData = async () => { + try { + const response = await Instance.get("/plant/?format=json"); + setData(response.data); + setFilteredData(response.data); // Изначально показываем все данные + } catch (err) { + console.error(err); + } + }; + + fetchData(); + }, []); + + const handleSearchChange = (e) => { + const term = e.target.value.toLowerCase(); + setSearchTerm(term); + + const filtered = data.filter((plant) => + plant.name.toLowerCase().includes(term) + ); + setFilteredData(filtered); + }; + + return ( +
+
+
+ + +
+
+
+ {filteredData.map((item) => ( + onPlantSelect(item)} // Передаем объект растения + /> + ))} +
+
+ ); +} diff --git a/frontend/src/components/main-page/Basket/Order/PlantArea/plant-area.css b/frontend/src/components/main-page/Basket/Order/PlantArea/plant-area.css new file mode 100644 index 00000000..18843c75 --- /dev/null +++ b/frontend/src/components/main-page/Basket/Order/PlantArea/plant-area.css @@ -0,0 +1,85 @@ +.plant-container{ + display: flex; + flex-direction: column; + justify-content: space-around; + align-items: center; + width: 90px; + height: 100px; + border-radius: 15px; + outline: none; + border: 3px solid white; + background-color: rgba(40, 37, 40, 0.5); + box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + transition: 0.3s ease; +} + +.plant-container:focus { + background-color: #96c2a8; + transform: scale(0.95); +} + +.plant-container:active { + transform: scale(0.9); +} + +.plant-image-wrapper{ + width: 60px; + height: 60px; + border-radius: 50%; +} + +.plant-image{ + width: 60px; + height: 60px; + border-radius: 50%; +} + +.plant-area { + display: flex; + flex-wrap: wrap; /* Разрешает перенос строк */ + gap: 7px; + justify-content: center; +} + +.plant-search-area { + display: flex; + justify-content: center; + align-items: center; +} + +.plant-search-input-wrapper { + position: relative; /* Для абсолютного позиционирования кнопки */ + width: 100%; /* Чтобы адаптировать к ширине контейнера */ + max-width: 400px; /* Опционально, максимальная ширина */ + margin-bottom: 5px; +} + +.plant-area-input { + width: 100%; /* Полная ширина */ + padding: 10px 40px 10px 10px; /* Отступ справа для кнопки */ + font-size: 16px; /* Размер шрифта */ + border: 1px solid #ccc; /* Граница */ + outline: none; + border-radius: 20px; /* Закругленные углы */ + box-shadow: 0 0 3px rgba(0, 0, 0, 0.5); + +} + +.plant-area-input:focus{ + border: 1px solid #1b6d85; +} + +.plant-search-button { + position: absolute; /* Абсолютное позиционирование внутри контейнера */ + top: 50%; /* Выравнивание по вертикали */ + right: 10px; /* Расстояние от правого края */ + transform: translateY(-50%); /* Центровка по вертикали */ + background: none; /* Убираем фон */ + border: none; /* Убираем границу */ + cursor: pointer; /* Указатель мыши */ +} + +.plant-search-button img { + width: 20px; /* Размер иконки */ + height: 20px; +} \ No newline at end of file diff --git a/frontend/src/components/main-page/Basket/Order/order.css b/frontend/src/components/main-page/Basket/Order/order.css new file mode 100644 index 00000000..aa3cf61d --- /dev/null +++ b/frontend/src/components/main-page/Basket/Order/order.css @@ -0,0 +1,212 @@ +.order-wrapper { + display: flex; + justify-content: center; + overflow: hidden; +} + +.order { + gap: 10px; + padding: 20px; + width: auto; + display: flex; + justify-content: space-between; +} + +.order-info { + padding: 20px; + border-radius: 20px; + width: 800px; + height: 400px; + background-color: rgba(222, 184, 135, 0.7); + display: flex; + gap: 10px; +} + +.order-order { + padding: 20px; + border-radius: 20px; + width: 300px; + height: 400px; + background-color: rgba(222, 184, 135, 0.7); + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; +} + +.order-description { + width: auto; + font-size: 20px; + background-color: rgba(255, 255, 255, 0.7); /* Полупрозрачный белый */ + padding: 10px; + border-radius: 10px; + backdrop-filter: blur(2px); /* Размытие заднего фона */ + -webkit-backdrop-filter: blur(10px); /* Для поддержки в Safari */ + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); /* Легкая тень для акцента */ +} + +.license-wrapper { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + padding: 20px; + max-width: 83%; + min-height: 83vh; + height: auto; + background-color: rgb(120, 127, 80, 0.5); + margin: 2vh auto; + border-radius: 20px; + overflow-y: auto; +} + +.order-info-wrapper { + display: flex; + justify-content: space-around; + align-items: center; + width: 500px; + height: 100%; + background-color: cadetblue; + gap: 20px; +} + +.order-image { + width:100%; + height: 100%; + object-fit: cover; + border-radius: 20px; + +} + +.order-image-align { + margin: 10px; + width: 200px; + height: 200px; + display: flex; + justify-content: center; + align-items: center; +} +.order-change-volume { + display: flex; + gap: 10px; + align-items: center; + justify-content: center; +} + +.order-submit-wrapper { + display: flex; + flex-direction: column; + gap: 5px; +} + +.order-submit-button-container { + display: flex; + justify-content: center; +} + +/* Стили для поля ввода комментария */ +/* Стили для поля ввода комментария */ +.order-input { + width: 100%; + height: 100%; + padding: 10px; + font-size: 1em; + border-radius: 8px; + border: 1px solid #ddd; + margin: 10px 0; + background-color: #f9f9f9; + outline: none; + transition: all 0.3s ease; + word-wrap: break-word; /* Перенос текста на следующую строку */ + resize: none; +} + +.order-input:focus { + border-color: #4caf50; /* Цвет рамки при фокусе */ + background-color: #fff; /* Изменение фона при фокусе */ +} + +/* Стили для кнопок */ +.order-submit-button-container { + display: flex; + justify-content: center; + margin-top: 20px; + gap: 40px; +} + +.order-submit-button, +.order-cancel-button { + padding: 10px 20px; + font-size: 1.1em; + border-radius: 5px; + border: none; + cursor: pointer; + transition: background-color 0.3s ease; +} + +.order-submit-button { + background-color: #4caf50; /* Зеленая кнопка для заказа */ + color: white; +} + +.order-submit-button:hover { + background-color: #45a049; +} + +.order-cancel-button { + background-color: #f44336; /* Красная кнопка для отмены */ + color: white; +} + +.order-cancel-button:hover { + background-color: #e53935; +} + +.order-garden-list { + width: 370px; + height: 100%; + background-color: rgba(221, 221, 221, 0.7); + overflow: auto; + padding: 10px; + border-radius: 20px; +} + +.fertilize_btn { + width: 50px; + border-radius: 10px; + border: 1px solid #ddd; + outline: none; +} + +.green { + background-color: #45a049; + border: 1px solid #0f3a42; +} + +.green:active { + background-color: #2c6c30; +} + +.red { + background-color: #f44336; + border: 1px solid #420f13; + +} + +.red:active { + background-color: #e53935; + +} + +.order-wrapper-itog { + display: flex; + justify-content: space-around; + align-items: center; +} + +.plant-area-input{ + width: 100%; + height: 80%; + border-radius: 20px; + border: 1px solid #ddd; +} diff --git a/frontend/src/components/main-page/Basket/basket.css b/frontend/src/components/main-page/Basket/basket.css new file mode 100644 index 00000000..36cd4ee1 --- /dev/null +++ b/frontend/src/components/main-page/Basket/basket.css @@ -0,0 +1,8 @@ +.basket-empty { + display: flex; + justify-content: center; + align-items: center; + text-align: center; + width: 100%; + height: 70vh; +} diff --git a/frontend/src/components/main-page/Contractor/Contractor.js b/frontend/src/components/main-page/Contractor/Contractor.js index 4a7fbbbc..97bdbc64 100644 --- a/frontend/src/components/main-page/Contractor/Contractor.js +++ b/frontend/src/components/main-page/Contractor/Contractor.js @@ -1,7 +1,416 @@ -import React from 'react' +import React, { useEffect, useState } from "react"; +import Instance from "../../api/instance"; +import "./user.css"; + +const options = { + year: "numeric", + month: "long", + day: "2-digit", + hour: "2-digit", + minute: "2-digit", + timeZone: "UTC", +}; + +function getDeclension(quantity, one, few, many) { + if (quantity % 10 === 1 && quantity % 100 !== 11) { + return one; + } else if ( + [2, 3, 4].includes(quantity % 10) && + ![12, 13, 14].includes(quantity % 100) + ) { + return few; + } else { + return many; + } +} + +function correctDate(date) { + const newDate = new Date(date); + return newDate.toLocaleString("ru-RU", options); +} export default function Contractor() { - return ( -
Contractor
- ) + const [user, setUser] = useState(null); + const [orders, setOrders] = useState([]); + const [workers, setWorkers] = useState({}); + const [plants, setPlants] = useState({}); + + const [tooltip, setTooltip] = useState({ + visible: false, + content: "", + position: { x: 0, y: 0 }, + }); + + const [isModalOpen, setIsModalOpen] = useState(false); + const [modalAnimation, setModalAnimation] = useState(false); + const [amount, setAmount] = useState(""); // Track input amount + + const user_id = localStorage.getItem("user_id"); + + useEffect(() => { + Instance.get(`person/${user_id}`) + .then((response) => { + setUser(response.data); + }) + .catch((error) => console.error("Failed to fetch user data: ", error)); + }, [user_id]); + + useEffect(() => { + Instance.get("/order/my_orders") + .then((response) => { + setOrders(response.data); + }) + .catch((error) => console.error("Failed to fetch order data: ", error)); + }, [user_id]); + + useEffect(() => { + const uniqueWorkers = Array.from( + new Set(orders.map((order) => order.worker).filter(Boolean)) + ); + + uniqueWorkers.forEach((workerId) => { + if (!workers[workerId]) { + Instance.get(`/worker/${workerId}`) + .then((response) => { + setWorkers((prevWorkers) => ({ + ...prevWorkers, + [workerId]: response.data, + })); + }) + .catch((error) => + console.error(`Failed to fetch worker ${workerId}:`, error) + ); + } + }); + }, [orders, workers]); + + useEffect(() => { + const uniquePlants = Array.from( + new Set(orders.map((order) => order.plant).filter(Boolean)) + ); + + uniquePlants.forEach((plantId) => { + if (!plants[plantId]) { + Instance.get(`/plant/${plantId}`) + .then((response) => { + setPlants((prevPlants) => ({ + ...prevPlants, + [plantId]: response.data, + })); + }) + .catch((error) => console.error(error)); + } + }); + }, [orders]); + + const showTooltip = (description, price, event) => { + const rect = event.target.getBoundingClientRect(); + setTooltip({ + visible: true, + content: ( + <> +
Цена: {price ? {price}₽ : "Нет данных"}
+
Описание: {description || "Нет информации"}
+ + ), + position: { + x: rect.x + window.scrollX, + y: rect.y + window.scrollY + rect.height, + }, + }); + }; + + const hideTooltip = () => { + setTooltip({ visible: false, content: "", position: { x: 0, y: 0 } }); + }; + + const handleModalToggle = () => { + if (!isModalOpen) { + setIsModalOpen(true); + setTimeout(() => setModalAnimation(true), 10); + } else { + setModalAnimation(false); + setTimeout(() => setIsModalOpen(false), 400); + } + }; + + const handleUpdateUser = () => { + const amountToAdd = parseFloat(amount); + + // Проверяем, что введенная сумма больше нуля + if (amountToAdd > 0) { + // Получаем текущий баланс и добавляем к нему введенную сумму + const newBalance = user?.wallet_balance + amountToAdd; + + Instance.patch(`/person/${user_id}/`, { + wallet_balance: newBalance, + }) + .then((response) => { + setUser((prevUser) => ({ + ...prevUser, + wallet_balance: response.data.wallet_balance, + })); + setAmount(""); + handleModalToggle(); + }) + .catch((error) => { + console.error("Failed to recharge wallet:", error); + alert("Произошла ошибка при пополнении баланса."); + }); + } else { + alert("Введите корректную сумму."); + } + }; + + return ( +
+
+
+
+
+ User Avatar +
+
+
+

Имя: {user?.full_name}

+

Номер телефона: {user?.phone_number}

+
+
+

Баланс:

+
+

{user?.wallet_balance} ₽

+ plus +
+
+
+
+
+
+
+ {orders.map((order) => ( +
+
+
Заказ #{order.id}
+
Поле #{order.field}
+
+
+ { +
+
+
+ {plants[order.plant] + ? plants[order.plant].name + : "Загрузка"}{" "} + {order.beds_count} {""} + {getDeclension( + order.beds_count, + "грядка", + "грядки", + "грядок" + )} +
+
+ Удобрение:{" "} + {order.fertilize ? "Присутствует" : "Отсутствует"} +
+
+
Стоимость: {order.total_cost} ₽.
+
+ Выполняет:{" "} + + showTooltip( + workers[order.worker]?.description, + workers[order.worker]?.price, + event + ) + } + onMouseLeave={hideTooltip} + > + {workers[order.worker]?.name || "Загрузка..."} + +
+
+
+
+
Создан: {correctDate(order.created_at)}
+
Срок Выполнения: {correctDate(order.completed_at)}
+
+
+ ))} +
+
+
+ + {tooltip.visible && ( +
+ {tooltip.content} +
+ )} + + {isModalOpen && ( +
+
e.stopPropagation()} + > +

+ Пополнение баланса +

+
+ setAmount(e.target.value)} + onKeyDown={(e) => { + const allowedKeys = [ + "Backspace", + "Tab", + "ArrowLeft", + "ArrowRight", + "Delete", + ]; + if ( + !/[0-9]/.test(e.key) && + !allowedKeys.includes(e.key) && + !(e.key === "." && !e.target.value.includes(".")) + ) { + e.preventDefault(); + } + }} + /> + + ₽ + +
+
+
+ )} +
+ ); } diff --git a/frontend/src/components/main-page/Contractor/user.css b/frontend/src/components/main-page/Contractor/user.css new file mode 100644 index 00000000..e63e7646 --- /dev/null +++ b/frontend/src/components/main-page/Contractor/user.css @@ -0,0 +1,153 @@ +.lk-user-info-wrapper { + display: flex; + align-items: center; + flex-direction: row; + justify-content: space-between; + width: 700px; + height: 300px; + padding: 15px; + background-color: rgb(250, 235, 215, 0.3); + border-radius: 20px; +} + +.lk-img { + width: 270px; + height: 270px; + display: flex; + justify-content: center; + align-items: center; + border-radius: 7px; +} + +.lk-centered { + display: flex; + justify-content: center; +} + +.lk-user-text-wrapper { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: space-between; + width: 300px; + height: 100%; +} + +.lk-user-text-wrapper h1, +p { + margin: 0; +} + +.lk-user-text-wrapper h1 { + margin: 0 0 2vh 0; +} + +.lk-user-balance { + padding: 0 20px 0 20px; + width: 100%; + height: 40px; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + background-color: beige; +} + +.lk-plus-img { + width: 20px; + height: 20px; + cursor: pointer; + transition: 0.3s ease; +} + +.lk-plus-img:hover { + transform: scale(1.1); +} + +.lk-user-orders { + width: 100%; + margin-top: 20px; +} + +.user-order { + width: 1150px; + height: 150px; + background-color: #afaf8f; + margin-top: 20px; + display: flex; + justify-content: flex-start; + padding: 14px; + gap: 20px; + border-radius: 10px; + color: #333; +} + +.user-order-numbers { + display: flex; + flex-direction: column; + justify-content: space-between; + width: 120px; + background-color: rgb(72, 128, 120, 0.4); + padding: 10px; + border-radius: 5px; +} + +.order-plant-image { + width: 100px; + height: 100px; + border-radius: 5px; +} + +.tooltip { + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2); + font-size: 14px; + color: #333; +} + +.lk-input-wrapper { + position: relative; /* Это важно для правильного позиционирования знака рубля */ + display: flex; + align-items: center; + gap: 10px; +} + +.lk-input-wrapper input { + padding-right: 30px; /* Создаем пространство для знака */ + padding-left: 10px; + font-size: 16px; + height: 30px; + width: 200px; + border: 1px solid #ccc; + border-radius: 5px; + outline: none; +} + +.lk-input-wrapper .currency-sign { + position: absolute; + right: 120px; /* Прижимаем знак рубля к правому краю поля */ + font-size: 16px; + color: #333; + pointer-events: none; /* Это позволяет пользователю кликать в поле ввода, не задевая знак */ + height: 30px; + display: flex; + justify-content: center; + align-items: center; + /* background-color: #333; */ + width: 30px; + border-radius: 0 6px 6px 0; + border: 1px solid #ccc; +} + +.lk-input-wrapper button { + padding: 10px 20px; + background-color: #4caf50; + color: white; + border: none; + border-radius: 5px; + cursor: pointer; + transition: 0.3s ease; +} + +.lk-input-wrapper button:hover { + background-color: #45a049; +} diff --git a/frontend/src/components/main-page/Garden/PlotInfo/PlotInfoWindow/PlotInfoWindow.js b/frontend/src/components/main-page/Garden/PlotInfo/PlotInfoWindow/PlotInfoWindow.js index de9339e0..b4b311e5 100644 --- a/frontend/src/components/main-page/Garden/PlotInfo/PlotInfoWindow/PlotInfoWindow.js +++ b/frontend/src/components/main-page/Garden/PlotInfo/PlotInfoWindow/PlotInfoWindow.js @@ -1,29 +1,32 @@ -import React, { useState, useEffect } from 'react'; +import React, { useState, useEffect } from "react"; export default function PlotInfoWindow({ item }) { - const [isVisible, setIsVisible] = useState(false); + const [isVisible, setIsVisible] = useState(false); - useEffect(() => { - if (item) { - setIsVisible(true); - } else { - setIsVisible(false); - } - }, [item]); + useEffect(() => { + if (item) { + setIsVisible(true); + } else { + setIsVisible(false); + } + }, [item]); - return ( -
-
-

Информация об объекте:

-

Название: {item.state}

-

Площадь: {item.size}

-

Цена: {item.price}

-
- -
-

ID: {item.id}

- -
+ return ( +
+
+
+ img +
+
+

Лучшее решение для начинающего предпринимателя!

+
    +
  • Минимальные обязательства
    • +
  • Простое обслуживание
    • +
  • Идеально для сезонного использования
    • +
  • Цена: {item.price}
    • +
- ); +
+
+ ); } diff --git a/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js b/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js index b32d303a..17adc1c8 100644 --- a/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js +++ b/frontend/src/components/main-page/Garden/SearchBlock/SearchBlock.js @@ -1,60 +1,81 @@ -import React, { useState, useEffect } from 'react'; -import '../garden.css'; -import SearchCard from '../SearchCard/SearchCard'; -import Instance from '../../../api/instance' +import React, { useState, useEffect } from "react"; +import "../garden.css"; +import SearchCard from "../SearchCard/SearchCard"; +import Instance from "../../../api/instance"; export default function SearchBlock({ onSelectItem }) { const [data, setData] = useState([]); const [loading, setLoading] = useState(false); const [error, setError] = useState(null); + const [searchTerm, setSearchTerm] = useState(""); useEffect(() => { - const fetchData = async () => { - try { - setLoading(true); - const response = await Instance.get('/field/?format=json') + setLoading(true); + Instance.get("/field/?format=json") + .then((response) => { setData(response.data); - } catch (err) { + }) + .finally(() => setLoading(false)) + .catch((err) => { setError(err); - } finally { - setLoading(false); - } - }; - - fetchData(); + }); }, []); + const filteredData = data.filter((item) => + item.name.toLowerCase().includes(searchTerm.toLowerCase()) + ); + const handleCardClick = (item) => { onSelectItem(item); }; + const handleSearchChange = (e) => { + setSearchTerm(e.target.value); + }; + return ( -
-
- - Search Icon +
+
+ + Search Icon
- {loading ? ( -
-
-
- ) : error ? ( -
-

- Error: {error.message} -

-
- ) : data.length === 0 ? ( -
-

Пусто

-
- ) : ( -
- {data.map((item) => ( - handleCardClick(item)} /> - ))} -
- )} + {loading ? ( +
+
+
+ ) : error ? ( +
+

+ Error: {error.message} +

+
+ ) : filteredData.length === 0 ? ( +
+

Пусто

+
+ ) : ( +
+ {filteredData.map((item) => ( + handleCardClick(item)} + /> + ))} +
+ )}
); -} \ No newline at end of file +} diff --git a/frontend/src/components/main-page/Garden/SearchCard/SearchCard.js b/frontend/src/components/main-page/Garden/SearchCard/SearchCard.js index 62494cef..5539802e 100644 --- a/frontend/src/components/main-page/Garden/SearchCard/SearchCard.js +++ b/frontend/src/components/main-page/Garden/SearchCard/SearchCard.js @@ -1,10 +1,31 @@ -import React from 'react'; +import React from "react"; +import { useBasket } from "../../../context/BasketContext"; export default function SearchCard({ item, onClick }) { + const { addToBasket } = useBasket(); return ( -
- -

Название: {item.name}
Кол-во грядок:{item.count_beds}
Цена: {item.price}

+
+
+ img +
+

+ {item.name}, {item.id} +

+ +
+ Свободно {item.count_free_beds} грядок +
+ Цена: {item.price} Рублей / грядка +
+
+
+
addToBasket(item)}> + img +
); } diff --git a/frontend/src/components/main-page/Garden/garden.css b/frontend/src/components/main-page/Garden/garden.css index df249456..fa00828f 100644 --- a/frontend/src/components/main-page/Garden/garden.css +++ b/frontend/src/components/main-page/Garden/garden.css @@ -1,124 +1,192 @@ .search-block { - display: flex; - align-items: center; - position: sticky; - z-index: 10; - padding: 10px; + display: flex; + align-items: center; + position: sticky; + z-index: 10; + padding: 10px; } .container-plot-wrapper { - display: flex; - width: 100%; - height: 100%; - flex-direction: column; - justify-content: space-between; - opacity: 0; - /* Начальная прозрачность */ - transition: opacity 0.3s ease, height 0.3s ease; - /* Плавный переход для opacity и height */ + display: flex; + width: 100%; + height: 100%; + flex-direction: column; + justify-content: space-between; + opacity: 0; + /* Начальная прозрачность */ + transition: opacity 0.3s ease, height 0.3s ease; + /* Плавный переход для opacity и height */ } .container-plot-wrapper.visible { - opacity: 1; - /* Полная видимость */ - /* height: auto; Если хотите анимировать высоту, убедитесь, что элемент имеет фиксированную высоту в начале */ + opacity: 1; } - .container-plot-info { - padding: 20px; - border-radius: 20px; - margin: 0 auto; - width: 60%; - height: 64%; - background-color: #3498db; + padding: 20px; + border-radius: 20px; + margin: 0 auto; + width: 100%; + height: 100%; + background-color: rgba(150, 194, 168, 0.5); + display: flex; + justify-content: space-around; + align-items: center; + gap: 10px; } - .container-plot-products { - margin: 0 auto; - padding: 20px; - width: 80%; - height: 35%; - border-radius: 20px; - background-color: #96c2a8; + margin: 0 auto; + padding: 20px; + width: 80%; + height: 35%; + border-radius: 20px; + background-color: rgba(150, 194, 168, 0.7); } .scrolled-content { - height: 92%; - overflow-y: auto; - overflow-x: hidden; - border-radius: 20px; + height: auto; + overflow-y: auto; + overflow-x: hidden; + border-radius: 20px; } .search-input { - width: 100%; - height: 4vh; - border-radius: 20px; - padding: 20px; - padding-right: 50px; - outline: none; - border: none; - box-sizing: border-box; - position: sticky; - top: 0; - z-index: 1000; + width: 100%; + height: 4vh; + border-radius: 20px; + padding: 20px; + padding-right: 50px; + outline: none; + border: none; + box-sizing: border-box; + position: sticky; + top: 0; + z-index: 1000; } .search-icon { - position: absolute; - right: 15px; - width: 30px; - height: 30px; - cursor: pointer; - opacity: 0.6; - transition: .3s all; - z-index: 1001; + position: absolute; + right: 15px; + width: 30px; + height: 30px; + cursor: pointer; + opacity: 0.6; + transition: 0.3s all; + z-index: 1001; } .search-icon:hover { - transform: scale(1.1); + transform: scale(1.1); } .loading-container, .error-container, .empty-container { - display: flex; - justify-content: center; - align-items: center; - margin: 0 auto; - height: 100vh; - max-height: 72vh; + display: flex; + justify-content: center; + align-items: center; + margin: 0 auto; + height: 100vh; + max-height: 72vh; } .select-wrapper { - display: flex; - justify-content: center; - align-items: center; - margin: 0 auto; - height: 100vh; - max-height: 84vh; + display: flex; + justify-content: center; + align-items: center; + margin: 0 auto; + height: auto; + max-height: 84vh; } .search-card-img { - border-radius: 10px; - width: 100px; - height: 100px; - margin-right: 10px; + border-radius: 10px; + width: 100px; + height: 100px; + margin-right: 10px; + object-fit: cover; + object-position: center; } .search-card-wrapper { - display: flex; - padding: 15px; - margin: 2vh 1vh; - border-radius: 20px; - width: 95%; - height: auto !important; - background-color: darkgray; - transition: .3s all; + display: flex; + align-items: center; + justify-content: space-between; + padding: 15px; + margin: 2vh 1vh; + border-radius: 20px; + width: 95%; + height: auto; + background-color: rgba(236, 228, 211, 0.5); + transition: 0.3s all; +} + +.search-card-wrapper-v2 { + display: flex; + justify-content: center; + align-items: center; +} + +.add-to-basket { + display: flex; + justify-content: center; + align-items: center; + width: 50px; + height: 50px; + background-color: rgba(29, 16, 3, 0.5); + border-radius: 50%; + transition: 0.3s ease; +} + +.add-to-basket:hover { + transform: scale(0.95); +} + +.add-to-basket-img { + width: 40px; } .search-card-wrapper:hover { - transform: scale(1.03); - cursor: pointer; -} \ No newline at end of file + transform: scale(1.03); + cursor: pointer; +} + +.plot-image-wrapper { + width: 60%; + height: 80%; + object-fit: cover; +} + +@media (max-width: 1200px) and (max-height: 1080px) { +} +.container-wrapper-img { + display: flex; + justify-content: center; + align-items: center; + width: auto; + height: 44vh; + overflow: hidden; + border-radius: 20px; +} + +.container-for-text { + font-size: 18px !important; +} + +.container-wrapper-info { + display: flex; + flex-direction: row; +} + +.plot-card-img { + width: 100%; + transition: 0.5s ease; + height: 100%; + border-radius: 20px; + object-fit: cover; +} + +.plot-card-img:hover { + transform: scale(1.01); +} diff --git a/frontend/src/components/main-page/LandingPage/LandingPage.jsx b/frontend/src/components/main-page/LandingPage/LandingPage.jsx new file mode 100644 index 00000000..6b630fd8 --- /dev/null +++ b/frontend/src/components/main-page/LandingPage/LandingPage.jsx @@ -0,0 +1,320 @@ +import "./main.css"; +import LoginBtn from "../ui/login-btn/LoginBtn"; +import RegisterBtn from "../ui/register-btn/RegisterBtn"; +import {Link, Route, Routes} from "react-router-dom"; +import Header from "../../header/Header"; + +export default function LandingPage() { + const state = localStorage.getItem("accessToken"); + return ( +
+
+
+ logo +
+ {state && state.length > 0 ? ( + +
e.currentTarget.style.transform = "scale(1.1)"} + onMouseLeave={(e) => e.currentTarget.style.transform = "scale(1)"} + > + По коням! +
+ + + ) : ( +
+ + +
+ )} +
+ +
+
+
+

+ BSTUteam +

+

+ представляет +

+
+
+ +
+
+
+
+
+ img +
+

+ Денис +

+

Наш DevOps инженер

+
+
+
+ +
+
+ img +
+

+ Леонид +

+

Наш Front-End разработчик

+
+
+
+ +
+
+ img +
+

+ Анастасия +

+

Наш Back-End разработчик

+
+
+
+ +
+
+ img +
+

+ Николай +

+

Наш Тестировщик

+
+
+
+
+
+ img +
+

+ Дарья +

+

Наш Дизайнер

+
+
+
+
+
+ Мы – команда инженеров, которая делает управление виртуальными + грядками проще и удобнее! +
+
+
+
+
+

+ ТАМПРОГ +

{" "} + – автоматизация, которая работает для Вас и вашего урожая. +
+
+
+
+
+
+
+ + }/> + +
+ ); +} diff --git a/frontend/src/components/main-page/LandingPage/main.css b/frontend/src/components/main-page/LandingPage/main.css new file mode 100644 index 00000000..35b333bd --- /dev/null +++ b/frontend/src/components/main-page/LandingPage/main.css @@ -0,0 +1,207 @@ +.section1, +.section2, +.section3 { + width: 100%; + min-height: 100.2vh; + position: relative; + display: flex; + justify-content: center; + align-items: center; + transform-style: preserve-3d; + scroll-snap-align: start; /* "Липнуть" к началу секции */ +} + +.section1::before { + content: ""; + width: 100%; + height: 100%; + position: absolute; + background-size: contain; + background: url("../../../../public/field1.jpg") top center no-repeat; + + transform: translateZ(-1px) scale(3); + filter: blur(3px); +} + +.section2 { + background: #1b6d85; + height: 100%; +} + +.section3 { + background: url("../../../../public/field2.jpg"); /* Путь к картинке */ + background-repeat: no-repeat; + background-size: cover; + background-position: center; + background-attachment: fixed; /* Закрепляем изображение */ + transform: scale(2); +} + +.default-text { + font-size: 14px; + color: white; + transform: scale(1, 1.1); +} + +.parallax-text { + font-size: 15vh; + color: white; + transform: scale(1, 1.1); +} + +.landing-main-wrapper { + perspective: 1px; + transform-style: preserve-3d; + height: 100vh; + overflow-x: hidden; + scroll-snap-type: y mandatory; +} + +.page-header { + position: absolute; + top: 0; + left: 0; + z-index: 2; + width: 100%; + height: 10vh; + background-color: rgba(15, 15, 15, 0.3); + display: flex; + justify-content: space-around; + align-items: center; +} + +.buttons-wrapper { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: auto; + gap: 20px; +} + +.landing-login-btn { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + gap: 10px; + transition: 0.3s ease; + color: #97c2a8; + font-size: 20px; + font-weight: 700; +} + +.landing-login-btn p { + text-shadow: 0px 0px 3px rgba(0, 0, 0, 1); +} + +.landing-login-btn img { + filter: drop-shadow(0px 0px 1px rgba(0, 0, 0, 1)); +} + +.dream-team { + display: flex; + justify-content: center; + align-items: center; + gap: 200px; +} + +.developer-wrapper { + width: 100px; + height: 100px; + position: relative; + transition: 0.5s ease; +} + +.dream-team-container { + width: 400px; + height: 500px; + display: flex; + flex-direction: column; +} + +.developer-img { + width: 100%; + height: auto; +} + +.popup { + position: absolute; + top: -50px; + left: -130px; + background-color: rgba(255, 255, 255, 0.8); + color: rgb(0, 0, 0); + padding: 10px; + border-radius: 20px; + font-size: 14px; + opacity: 0; + pointer-events: none; + transition: opacity 0.3s ease; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1), 0 1px 3px rgba(0, 0, 0, 0.08); + z-index: -1; +} + +.developer-wrapper:hover { + transform: scale(1.05); +} + +.developer-wrapper:hover .popup { + opacity: 1; + transform: translateY(0); + animation: bounce 0.5s; +} + +@keyframes bounce { + 0%, + 20%, + 60% { + transform: translateY(-5px); + } + 100% { + transform: translateY(0); + /* transform: translateY(0); */ + } + + 40% { + transform: translateY(-20px); + /* transform: translateY(-20px); */ + } + + 80% { + transform: translateY(-10px); + /* transform: translateY(-10px); */ + } +} + +.leonid { + width: 140px; +} + +.modern { + position: relative; /* Добавляем позиционирование */ + z-index: 999999; + width: 20vh; + height: 100%; +} + +.logo-modern { + width: 100%; + height: 100%; + position: absolute; /* Добавляем позиционирование */ + filter: drop-shadow(0px 0px 1px rgba(0, 0, 0, 1)); +} + +.landing-page-ease { + background-color: aliceblue; + /* transition: 1s ease; */ + animation: visible 2s ease; +} + +@keyframes visible { + 0% { + opacity: 0; + } + 100% { + opacity: 1; + } +} diff --git a/frontend/src/components/main-page/License/License.js b/frontend/src/components/main-page/License/License.js deleted file mode 100644 index 130cbfb5..00000000 --- a/frontend/src/components/main-page/License/License.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from 'react' - -export default function License() { - return ( -
License
- ) -} diff --git a/frontend/src/components/main-page/MainPage.js b/frontend/src/components/main-page/MainPage.js deleted file mode 100644 index 02253bbe..00000000 --- a/frontend/src/components/main-page/MainPage.js +++ /dev/null @@ -1,58 +0,0 @@ -import { useState } from 'react'; -import './style.css'; -import LoginBtn from './ui/login-btn/LoginBtn'; -import RegisterBtn from './ui/register-btn/RegisterBtn'; -export default function MainPage() { - const [loaded, setLoaded] = useState(false); - - const handleLoad = () => { - setLoaded(true); - }; - - return ( - <> -
-
TAMPROG
-
- - -
-
-
-
-
-
- field1 -
TAMPROG by BGTUTeam
-
-

Мы команда инженеров!

-
- field2 -
Что мы делаем?
-
-
- field1 -
Другой текст
-
-
-
-
- - ); -} diff --git a/frontend/src/components/main-page/style.css b/frontend/src/components/main-page/style.css index 98f8da17..34ba6b5e 100644 --- a/frontend/src/components/main-page/style.css +++ b/frontend/src/components/main-page/style.css @@ -1,550 +1,637 @@ * { - box-sizing: border-box; + box-sizing: border-box; } body, html { - margin: 0; - padding: 0; - height: 90vh; - font-family: Arial, sans-serif; -} - -.landing-page { - width: 100%; - display: flex; - flex-direction: column; - align-items: center; - overflow: hidden; -} - -.image-container { - position: relative; - /* Относительное позиционирование для контейнера */ - width: 100%; - /* Занимает всю ширину */ -} - -.text-overlay { - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - color: white; - font-size: 24px; - text-align: center; - background-color: rgba(0, 0, 0, 0.5); - padding: 10px; -} - -.header-for-landing { - position: fixed; - display: flex; - align-items: center; - justify-content: space-around; - top: 0; - left: 0; - width: 100%; - height: 100px; - z-index: 1000; - background-color: rgba(40, 37, 40, 0.5); -} - -.landing { - width: 200vh; - min-height: 100vh; - /* Минимальная высота для контента */ - background-color: whitesmoke; -} - -.landing img { - width: 100%; - height: auto; - object-fit: cover; - display: block; - margin: 0; - padding: 0; - opacity: 0; - transition: opacity 2s ease-out; -} - -.landing img.loaded { - opacity: 1; + margin: 0; + padding: 0; + height: 90vh; + font-family: Arial, sans-serif; } .user-interface-login { - width: 30px; -} - -.landing-login-btn { - display: flex; - align-items: center; - gap: 5px; - transition: .3s ease; - cursor: pointer; -} - -.landing-login-btn a { - font-weight: 500; - align-items: center; -} - -.landing-buttons { - display: flex; - align-items: center; - gap: 10px; -} - -.landing-register-btn { - transition: .3s ease; - cursor: pointer; -} - -.landing-register-btn:hover { - transform: scale(1.05); + width: 30px; + height: 30px; + transition: 0.3s ease; } @keyframes fade-in { - from { - opacity: 0; - transform: translateY(-10px); - } + from { + opacity: 0; + transform: translateY(-10px); + } - to { - opacity: 1; - transform: translateY(0); - } + to { + opacity: 1; + transform: translateY(0); + } } @keyframes fade-out { - from { - opacity: 1; - transform: translateY(0); - } + from { + opacity: 1; + transform: translateY(0); + } - to { - opacity: 0; - transform: translateY(-10px); - } + to { + opacity: 0; + transform: translateY(-10px); + } } .alert { - position: relative; - display: flex; - justify-content: center; - align-items: center; - font-size: 1.3em; - gap: 3px; - padding: 20px; - border-radius: 20px; - width: 100%; - height: 60px; - background-color: rgba(255, 205, 117, 0.7); - animation: fade-in 0.5s ease forwards; - /* Плавное появление */ - transition: opacity 0.5s ease, transform 0.5s ease; - /* Переходы для плавного исчезновения */ + position: relative; + display: flex; + justify-content: center; + align-items: center; + font-size: 1.3em; + gap: 3px; + padding: 20px; + border-radius: 20px; + width: 100%; + height: 60px; + background-color: rgba(255, 205, 117, 0.7); + animation: fade-in 0.5s ease forwards; + /* Плавное появление */ + transition: opacity 0.5s ease, transform 0.5s ease; + /* Переходы для плавного исчезновения */ } .alert.hide { - animation: fade-out 0.5s ease forwards; - /* Плавное исчезновение */ - opacity: 0; - transform: translateY(-10px); - pointer-events: none; - /* Блокирует взаимодействие после скрытия */ + animation: fade-out 0.5s ease forwards; + /* Плавное исчезновение */ + opacity: 0; + transform: translateY(-10px); + pointer-events: none; + /* Блокирует взаимодействие после скрытия */ } @keyframes filling { - from { - background-position: center 25%; - } + from { + background-position: center 25%; + } - to { - background-position: center 50%; - } + to { + background-position: center 50%; + } } .landing-container-text { - background-image: url(https://avatars.mds.yandex.net/i?id=efac26118587148006a28e09274db923_l-5905533-images-thumbs&n=13); - -webkit-text-fill-color: transparent; - -webkit-background-clip: text; - color: #FFFFFF; - font-weight: 800; - font-size: 150px; - font-family: 'Bungee', cursive; - animation: filling 2s ease forwards; + background-image: url(https://avatars.mds.yandex.net/i?id=efac26118587148006a28e09274db923_l-5905533-images-thumbs&n=13); + -webkit-text-fill-color: transparent; + -webkit-background-clip: text; + color: #ffffff; + font-weight: 800; + font-size: 150px; + font-family: "Bungee", cursive; + animation: filling 2s ease forwards; } .landing-login-btn:hover { - transform: scale(1.05); + transform: scale(1.05); } .landing-link { - text-decoration: none; - color: black + text-decoration: none; + color: black; } .main { - overflow: hidden; + overflow: hidden; } .main-enter-active { - animation: depth-in 0.7s forwards; + animation: depth-in 0.7s forwards; } .main-exit-active { - animation: depth-out 0.7s forwards; + animation: depth-out 0.7s forwards; } @keyframes depth-in { - 0% { - opacity: 0; - transform: translateZ(-100px) scale(0.95); - } + 0% { + opacity: 0; + transform: translateZ(-100px) scale(0.95); + } - 100% { - opacity: 1; - transform: translateZ(0) scale(1); - } + 100% { + opacity: 1; + transform: translateZ(0) scale(1); + } } @keyframes depth-out { - 0% { - opacity: 1; - transform: translateZ(0) scale(1); - } + 0% { + opacity: 1; + transform: translateZ(0) scale(1); + } - 100% { - opacity: 0; - transform: translateZ(-100px) scale(0.95); - } + 100% { + opacity: 0; + transform: translateZ(-100px) scale(0.95); + } } .header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 10px 20px; - background-color: #ece4d3; - border-radius: 20px; - max-width: 100%; - transition: transform 0.3s ease-out; - z-index: 1; - margin: 15px 20px 0 20px; - height: 84px; + display: flex; + justify-content: space-between; + align-items: center; + padding: 10px 20px; + background-color: #ece4d3; + border-radius: 20px; + max-width: 100%; + transition: transform 0.3s ease-out; + z-index: 1; + margin: 15px 20px 0 20px; + height: 84px; } .header:hover { - transform: scale(1.008); + transform: scale(1.008); } .logo { - max-width: 150px; - height: auto; - width: 140px; - cursor: pointer; + max-width: 150px; + height: auto; + width: 140px; + cursor: pointer; } .navbar { - display: flex; - gap: 20px; - position: relative; - /* Для размещения псевдоэлемента */ + display: flex; + gap: 20px; + position: relative; + /* Для размещения псевдоэлемента */ } .navbar a { - text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3); + text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3); - text-decoration: none; - font-size: 18px; - font-weight: bold; - color: #96c2a8; - position: relative; - /* Для позиционирования псевдоэлемента */ + text-decoration: none; + font-size: 18px; + font-weight: bold; + color: #96c2a8; + position: relative; + /* Для позиционирования псевдоэлемента */ } .navbar a::before { - border-radius: 20px; - content: ''; - position: absolute; - bottom: 110%; - left: 0; - right: 0; - height: 2px; - background-color: #96c2a8; - transform: scaleX(1); - transform-origin: left; - transition: transform 0.3s ease; + border-radius: 20px; + content: ""; + position: absolute; + bottom: 110%; + left: 0; + right: 0; + height: 2px; + background-color: #96c2a8; + transform: scaleX(1); + transform-origin: left; + transition: transform 0.3s ease; } .navbar a:hover::before { - transform: scaleX(0); + transform: scaleX(0); } .login-btn { - padding: 10px 20px; - border-radius: 10px; - border: none; - background-color: #b5b7a3; - color: white; - cursor: pointer; - transition: background-color 0.3s; - font-weight: 800; - font-size: 15px; - box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); + padding: 10px 20px; + border-radius: 10px; + border: none; + background-color: #b5b7a3; + color: white; + cursor: pointer; + transition: background-color 0.3s; + font-weight: 800; + font-size: 15px; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); } .login-btn:hover { - background-color: #8a927a; + background-color: #8a927a; } .content-container { - display: flex; - flex-wrap: wrap; - gap: 20px; - padding: 20px 20px 2px 20px; - height: 46.4vw; - justify-content: center; + display: flex; + flex-wrap: wrap; + gap: 20px; + padding: 20px 20px 2px 20px; + height: 83vh; + max-height: 100%; + justify-content: center; } .box1 { - flex: 1 1 25%; - background-color: rgba(129, 186, 131, 0.5); - border-radius: 20px; - padding: 20px; - transition: transform 0.3s ease; + flex: 1 1 25%; + background-color: rgba(129, 186, 131, 0.5); + border-radius: 20px; + padding: 20px; + transition: transform 0.3s ease; - height: 100%; - overflow-y: auto; + height: 100%; + overflow-y: auto; } .box2 { - flex: 1 1 70%; - background-color: rgba(129, 186, 131, 0.5); - border-radius: 20px; - height: 100%; - padding: 20px; - display: flex; - gap: 40px; - transition: 0.3s ease; + flex: 1 1 70%; + background-color: rgba(129, 186, 131, 0.5); + border-radius: 20px; + height: 100%; + padding: 20px; + display: flex; + gap: 40px; + transition: 0.3s ease; } .centered-into-wrappers { - display: flex; - justify-content: center; - align-items: center; + display: flex; + justify-content: center; + align-items: center; + gap: 10px; } .text-color { - color: #96c2a8; - font-size: var(--font-size); - font-weight: 800; - text-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5); + color: #96c2a8; + font-size: var(--font-size); + font-weight: 800; + text-shadow: 2px 2px 5px rgba(0, 0, 0, 0.5); } .about-wrapper { - padding: 20px; - max-width: 75%; - height: 83vh; - max-height: 100%; - background-color: rgb(129, 186, 131, 0.5); - margin: 2vh auto; - border-radius: 20px; - display: flex; - flex-direction: column; - justify-content: space-evenly; -} - -.license-wrapper { - padding: 20px; - max-width: 83%; - height: 83vh; - max-height: 100%; - background-color: rgb(128, 0, 128, 0.5); - margin: 2vh auto; - border-radius: 20px; - + padding: 20px; + max-width: 75%; + height: 83vh; + max-height: 100%; + background-color: rgb(129, 186, 131, 0.5); + margin: 2vh auto; + border-radius: 20px; + display: flex; + flex-direction: column; + justify-content: space-evenly; } .contractor-wrapper { - padding: 20px; - max-width: 83%; - height: 83vh; - max-height: 100%; - background-color: rgb(138, 146, 122, 0.5); - border-radius: 20px; - margin: 2vh auto; + padding: 20px; + max-width: 83%; + height: auto; + min-height: 83vh; + background-color: rgb(138, 146, 122, 0.5); + border-radius: 20px; + margin: 2vh auto; } .box2 .card { - flex: 0 0 220px; - max-width: 220px; - height: 300px; - margin-bottom: 0; + flex: 0 0 220px; + max-width: 220px; + height: 300px; + margin-bottom: 0; } .spinner { - border: 4px solid rgba(0, 0, 0, 0.1); - border-radius: 50%; - border-top: 4px solid #3498db; - width: 50px; - height: 50px; - animation: spin 1s linear infinite; + border: 4px solid rgba(0, 0, 0, 0.1); + border-radius: 50%; + border-top: 4px solid #3498db; + width: 50px; + height: 50px; + animation: spin 1s linear infinite; } .centered-spinner { - display: flex; - justify-content: center; - align-items: center; - width: 100%; - height: 100%; + display: flex; + justify-content: center; + align-items: center; + width: 100%; + height: 100%; } .not-found-container { - position: absolute; - z-index: 99999; - width: 100%; - height: 100vh; - background-color: #96c2a8; - display: flex; - justify-content: center; - align-items: center; - gap: 100px; + position: absolute; + z-index: 99999; + width: 100%; + height: 100vh; + background-color: #96c2a8; + display: flex; + justify-content: center; + align-items: center; + gap: 100px; } -.not-found-container>div { - padding: 2%; - width: 30%; - height: 50%; - /* background-color: #3498db; */ +.not-found-container > div { + padding: 2%; + width: 30%; + height: 50%; } .not-found-container h1 { - font-size: 10em; - margin: 0; + font-size: 10em; + margin: 0; } .not-found-container p { - /* font-size: 1em; */ - margin: 0; - font-weight: 600; + margin: 0; + font-weight: 600; } .not-found-container img { - width: 100%; - /* height: auto; */ + width: 100%; +} + +.counter-wrapper { + margin: 0 3px 0 3px; + display: flex; + width: auto; + background-color: #8a927a; + border-radius: 5px; +} + +.counter-wrapper input { + width: 40px; + outline: none; + transform: scale(0.9); + border: none; +} + +.counter-wrapper button { + display: flex; + justify-content: center; + align-items: center; + width: 20px; + border: 0; + transform: scale(0.9); +} + +.btn-left { + border-radius: 5px 0px 0 5px; } +.btn-right { + border-radius: 0 5px 5px 0; +} @keyframes spin { - 0% { - transform: rotate(0deg); - } + 0% { + transform: rotate(0deg); + } - 100% { - transform: rotate(360deg); - } + 100% { + transform: rotate(360deg); + } } @media (max-width: 684px) and (max-height: 1080px) { - .navbar { - display: none; - } + .navbar { + display: none; + } } @media (max-width: 1200px) and (max-height: 1080px) { - .header { - display: flex; - justify-content: space-between; - align-items: center; - padding: 10px 20px; - background-color: #ece4d3; - border-radius: 20px; - max-width: 100%; - transition: transform 0.3s ease-out; - z-index: 1; - margin: 15px 20px 0 20px; - height: 84px; - } - - .logo { - max-width: 120px; - } - - .box1 { - width: 100%; - max-height: 300px; - overflow: hidden; - } - - .box2 { - height: 57vh; - width: 100%; - flex: 1 1 auto; - } - - .content-container { - display: flex; - gap: 20px; - padding: 20px; - height: 89vh; - max-height: 100vh; - overflow: hidden; - justify-content: center; - flex-direction: row; - } + .container-plot-info { + width: 80% !important; + } + + .logo { + max-width: 120px; + } + + .box1 { + width: 100%; + max-height: 300px; + } + + .box2 { + height: 41vh; + width: 100%; + flex: 1 1 auto; + } + .content-container { + display: flex; + gap: 20px; + padding: 20px; + height: auto; + overflow: hidden; + justify-content: center; + flex-direction: row; + } + + .order-input { + height: 14vh !important; + } + .order-info { + width: auto !important; + min-height: 50vh !important; + height: auto !important; + display: flex; + flex-direction: column; + gap: 5px; + } + + .order-info-wrapper { + width: auto !important; + min-height: 300px; + height: auto !important; + background-color: cadetblue; + gap: 20px; + } + + .oreder-description { + width: 40vw !important; + } + .order-image { + width: 20vw !important; + height: auto !important; + } + + .order-garden-list { + width: auto !important; + height: 100%; + background-color: #ddd; + overflow: auto; + } + + .order { + display: flex; + flex-direction: column; + padding: 2vw !important; + } + + .license-wrapper { + padding: 0 !important; + } + + .loading-container, + .error-container, + .empty-container { + height: 25vh !important; + } + + .container-plot-products { + visibility: hidden; + } + .container-plot-info { + height: 100% !important; + } + .plot-card-img { + width: 250px !important; + } + .container-wrapper-img { + height: 30vh !important; + } + .container-for-text { + font-size: 14px !important; + } + .order-order { + width: auto !important; + } } @media (min-width: 1200px) and (max-height: 1080px) { - .box1 { - max-width: 300px; - } + .box1 { + max-width: 500px; + } + + .section1::before { + transform: translateZ(-1px) scale(4.7); + } + + .search-card-img { + width: 80px !important; + height: 80px !important; + } - .box2 { - max-width: 1060px; - } + .box2 { + max-width: 860px; + } + + .content-container { + display: flex; + justify-content: center; + height: 89vw; + max-height: 85vh; + overflow: hidden; + } - .content-container { - display: flex; - justify-content: center; - height: 89vw; - max-height: 86vh; - overflow: hidden; - } + .loading-container, + .error-container, + .empty-container { + display: flex; + justify-content: center; + align-items: center; + margin: 0 auto; + height: 100vh; + max-height: 69vh; + } + + .search-card-wrapper { + height: 15vh !important; + } + + .text-into-search-card { + font-size: 13px; + display: flex; + justify-content: center; + align-items: center; + } + + .add-to-basket { + width: 30px !important; + height: 30px !important; + } + + .add-to-basket-img { + width: 30px !important; + } } @media (min-width: 1718px) { - .box1 { - max-width: 20%; - height: 100%; - } + .box1 { + max-width: 20%; + height: 100%; + } - .box2 { - gap: 24px; - max-width: 70%; - height: 100%; - } + .box2 { + gap: 24px; + max-width: 70%; + height: 100%; + } - .content-container { - justify-content: center; - height: 89vh; - max-height: 92vh; - } + .search-card-wrapper { + height: 10vh !important; + } } @media (min-width: 1922px) { - .about-wrapper { - height: 65vh; - width: 120vh; - } + .about-wrapper { + height: 65vh; + width: 120vh; + } + + .section1::before { + transform: translateZ(-1px) scale(7.1); + } + + .student-wrapper { + height: 12vh !important; + } + + .student-img { + height: 14vh !important; + } + + .description-fix-pos { + font-size: 1.2rem !important; + } } @media (min-width: 2300px) { - .logo { - margin-left: 15vw; - } - - .login-btn { - margin-right: 15vw; - } -} \ No newline at end of file + .logo { + margin-left: 15vw; + } + + .login-btn { + margin-right: 15vw; + } +} + +.user-icon-auth { + position: absolute; + left: 10px; + top: 50%; + transform: translateY(-50%); + width: 24px; + height: 24px; +} + +.basket-link-wrapper { + position: relative; +} + +.basket-indicator { + position: absolute; + top: -15px; + right: -15px; + background-color: red; + color: white; + font-size: 12px; + font-weight: bold; + border-radius: 50%; + width: 20px; + height: 20px; + display: flex; + align-items: center; + justify-content: center; + box-shadow: 0 0 5px rgba(0, 0, 0, 0.5); +} + +.header-into-card { + padding: 0; + margin: 0; + font-size: 18px; +} + +.backgound-header-wrapper { + position: absolute; + width: 100%; + background-color: #1d1003; + min-height: 100vh; + height: auto; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='600' height='600' viewBox='0 0 600 600'%3E%3Cpath fill='%234a2a0d' fill-opacity='0.4' d='M600 325.1v-1.17c-6.5 3.83-13.06 7.64-14.68 8.64-10.6 6.56-18.57 12.56-24.68 19.09-5.58 5.95-12.44 10.06-22.42 14.15-1.45.6-2.96 1.2-4.83 1.9l-4.75 1.82c-9.78 3.75-14.8 6.27-18.98 10.1-4.23 3.88-9.65 6.6-16.77 8.84-1.95.6-3.99 1.17-6.47 1.8l-6.14 1.53c-5.29 1.35-8.3 2.37-10.54 3.78-3.08 1.92-6.63 3.26-12.74 5.03a384.1 384.1 0 0 1-4.82 1.36c-2.04.58-3.6 1.04-5.17 1.52a110.03 110.03 0 0 0-11.2 4.05c-2.7 1.15-5.5 3.93-8.78 8.4a157.68 157.68 0 0 0-6.15 9.2c-5.75 9.07-7.58 11.74-10.24 14.51a50.97 50.97 0 0 1-4.6 4.22c-2.33 1.9-10.39 7.54-11.81 8.74a14.68 14.68 0 0 0-3.67 4.15c-1.24 2.3-1.9 4.57-2.78 8.87-2.17 10.61-3.52 14.81-8.2 22.1-4.07 6.33-6.8 9.88-9.83 12.99-.47.48-.95.96-1.5 1.48l-3.75 3.56c-1.67 1.6-3.18 3.12-4.86 4.9a42.44 42.44 0 0 0-9.89 16.94c-2.5 8.13-2.72 15.47-1.76 27.22.47 5.82.51 6.36.51 8.18 0 10.51.12 17.53.63 25.78.24 4.05.56 7.8.97 11.22h.9c-1.13-9.58-1.5-21.83-1.5-37 0-1.86-.04-2.4-.52-8.26-.94-11.63-.72-18.87 1.73-26.85a41.44 41.44 0 0 1 9.65-16.55c1.67-1.76 3.18-3.27 4.83-4.85.63-.6 3.13-2.96 3.75-3.57a71.6 71.6 0 0 0 1.52-1.5c3.09-3.16 5.86-6.76 9.96-13.15 4.77-7.42 6.15-11.71 8.34-22.44.86-4.21 1.5-6.4 2.68-8.6.68-1.25 1.79-2.48 3.43-3.86 1.38-1.15 9.43-6.8 11.8-8.72 1.71-1.4 3.26-2.81 4.7-4.3 2.72-2.85 4.56-5.54 10.36-14.67a156.9 156.9 0 0 1 6.1-9.15c3.2-4.33 5.9-7.01 8.37-8.07 3.5-1.5 7.06-2.77 11.1-4.02a233.84 233.84 0 0 1 7.6-2.2l2.38-.67c6.19-1.79 9.81-3.16 12.98-5.15 2.14-1.33 5.08-2.33 10.27-3.65l6.14-1.53c2.5-.63 4.55-1.2 6.52-1.82 7.24-2.27 12.79-5.06 17.15-9.05 4.05-3.72 9-6.2 18.66-9.9l4.75-1.82c1.87-.72 3.39-1.31 4.85-1.91 10.1-4.15 17.07-8.32 22.76-14.4 6.05-6.45 13.95-12.4 24.49-18.92 1.56-.96 7.82-4.6 14.15-8.33v-64.58c-4 8.15-8.52 14.85-12.7 17.9-2.51 1.82-5.38 4.02-9.04 6.92a1063.87 1063.87 0 0 0-6.23 4.98l-1.27 1.02a2309.25 2309.25 0 0 1-4.87 3.9c-7.55 6-12.9 10.05-17.61 13.19-3.1 2.06-3.86 2.78-8.06 7.13-5.84 6.07-11.72 8.62-29.15 10.95-11.3 1.5-20.04 4.91-30.75 11.07-1.65.94-7.27 4.27-6.97 4.1-2.7 1.58-4.69 2.69-6.64 3.66-5.63 2.8-10.47 4.17-15.71 4.17-17.13 0-41.44 11.51-51.63 22.83-12.05 13.4-31.42 27.7-45.25 31.16-7.4 1.85-11.85 7.05-14.04 14.69-1.26 4.4-1.58 8.28-1.58 13.82 0 .82.01.98.24 3.63.45 5.18.35 8.72-.77 13.26-1.53 6.2-4.89 12.6-10.59 19.43-13.87 16.65-22.88 46.58-22.88 71.68 0 2.39.02 4.26.06 8.75.12 10.8.1 15.8-.22 21.95-.56 11.18-2.09 20.73-5 29.3h-1.05c2.94-8.56 4.49-18.12 5.05-29.35.31-6.13.34-11.1.22-21.9-.04-4.48-.06-6.36-.06-8.75 0-25.32 9.07-55.47 23.12-72.32 5.6-6.72 8.88-12.99 10.38-19.03 1.09-4.4 1.18-7.85.74-12.93-.23-2.7-.24-2.86-.24-3.72 0-5.62.32-9.57 1.62-14.1 2.28-7.95 6.97-13.44 14.76-15.39 13.6-3.4 32.82-17.59 44.75-30.84C409 360.14 433.58 348.5 451 348.5c5.07 0 9.77-1.33 15.26-4.07 1.93-.96 3.9-2.05 6.58-3.62-.3.18 5.33-3.16 6.98-4.11 10.82-6.21 19.66-9.67 31.11-11.2 17.23-2.3 22.9-4.75 28.57-10.64 4.25-4.41 5.04-5.16 8.22-7.28 4.68-3.11 10.01-7.14 17.55-13.14a1113.33 1113.33 0 0 0 4.86-3.89l1.28-1.02a4668.54 4668.54 0 0 1 6.23-4.98c3.67-2.9 6.55-5.12 9.07-6.95 4.37-3.19 9.16-10.56 13.29-19.4v66.9zm0-116.23c-.62.01-1.27.06-1.95.13-6.13.63-13.83 3.45-21.83 7.45-3.64 1.82-8.46 2.67-14.17 2.71-4.7.04-9.72-.47-14.73-1.33-1.7-.3-3.26-.61-4.67-.93a31.55 31.55 0 0 0-3.55-.57 273.4 273.4 0 0 0-16.66-.88c-10.42-.16-17.2.74-17.97 2.73-.38.97.6 2.55 3.03 4.87 1.01.97 2.22 2.03 4.04 3.55a1746.07 1746.07 0 0 0 4.79 4.02c1.39 1.2 3.1 1.92 5.5 2.5.7.16.86.2 2.64.54 3.53.7 5.03 1.25 6.15 2.63 1.41 1.76 1.4 4.54-.15 8.88-2.44 6.83-5.72 10.05-10.19 10.33-3.63.23-7.6-1.29-14.52-5.06-4.53-2.47-6.82-7.3-8.32-15.26-.17-.87-.32-1.78-.5-2.86l-.43-2.76c-1.05-6.58-1.9-9.2-3.73-10.11-.81-.4-1.59-.74-2.36-1-2.27-.77-4.6-1.02-8.1-.92-2.29.07-14.7 1-13.77.93-20.55 1.37-28.8 5.05-37.09 14.99a133.07 133.07 0 0 0-4.25 5.44l-2.3 3.09-2.51 3.32c-4.1 5.36-7.06 8.48-10.39 11.12-.65.52-1.33 1.04-2.13 1.62l-4.11 2.94a106.8 106.8 0 0 0-5.16 3.99c-4.55 3.74-9.74 8.6-16.25 15.38-8.25 8.58-11.78 13.54-11.7 15.95.07 1.65 1.64 2.11 6.79 2.38 1.61.09 2.15.12 2.98.2 2.95.24 5.09.73 6.81 1.68 7.48 4.15 11.63 7.26 13.95 11.58 3.3 6.15.8 12.88-8.89 20.26-8.28 6.3-11.1 10.37-11.31 14.96-.06 1.17 0 1.93.26 4.43.69 6.47.25 10.65-2.8 17.42a44.23 44.23 0 0 1-4.16 7.53c-2.82 3.97-5.47 5.74-10.6 7.69-.43.16-3.34 1.23-4.27 1.59-1.8.68-3.38 1.36-5.01 2.14-4.18 2-8.4 4.6-13.1 8.24-8.44 6.51-13.23 14.56-15.98 25.06-1.1 4.2-1.55 6.81-2.8 15.21-1.26 8.6-2.17 12.64-4.08 16.55-2.1 4.28-11.93 26.59-12.97 28.88a382.7 382.7 0 0 1-6.37 13.41c-4.07 8.11-7.61 14.07-10.73 17.81-5.38 6.46-8.98 14.37-13.77 28.42a810.14 810.14 0 0 0-1.89 5.6c-1.8 5.35-2.96 8.6-4.26 11.85-6.13 15.32-25.43 26.31-46.46 26.31-11.2 0-20.58-2.74-31.02-8.55-5.6-3.13-4.55-2.42-22.26-14.54-14.33-9.8-17.7-10.73-20.47-6.9-.37.5-1.81 2.74-1.83 2.77a52.24 52.24 0 0 1-4.94 5.9c-.73.79-5.52 5.87-6.97 7.45-2.38 2.6-4.3 4.81-5.98 6.93a45.6 45.6 0 0 0-5.08 7.66c-1.29 2.57-1.9 5.25-2.66 10.6a997.6 997.6 0 0 1-.46 3.18h-1l.47-3.32c.77-5.45 1.4-8.2 2.75-10.9a46.54 46.54 0 0 1 5.2-7.84c1.7-2.14 3.63-4.38 6.03-6.98 1.45-1.59 6.24-6.68 6.96-7.46a51.58 51.58 0 0 0 4.84-5.78s1.47-2.26 1.86-2.8c3.25-4.5 7.08-3.44 21.84 6.67 17.67 12.08 16.62 11.38 22.19 14.48 10.3 5.73 19.5 8.43 30.53 8.43 20.65 0 39.57-10.77 45.54-25.69a219.7 219.7 0 0 0 4.24-11.8 6752.32 6752.32 0 0 0 1.88-5.6c4.83-14.16 8.47-22.14 13.96-28.73 3.05-3.66 6.56-9.57 10.6-17.61 1.97-3.93 4.04-8.31 6.35-13.38 1.03-2.28 10.88-24.61 12.98-28.91 1.85-3.79 2.75-7.76 4-16.25 1.24-8.44 1.7-11.07 2.81-15.32 2.8-10.7 7.71-18.94 16.33-25.6a73.18 73.18 0 0 1 13.29-8.35c1.66-.8 3.27-1.48 5.08-2.18.94-.36 3.86-1.43 4.28-1.59 4.95-1.88 7.44-3.55 10.14-7.33 1.35-1.9 2.68-4.3 4.06-7.37 2.97-6.58 3.39-10.59 2.72-16.9a27.13 27.13 0 0 1-.27-4.58c.22-4.94 3.21-9.24 11.7-15.7 9.33-7.11 11.66-13.34 8.62-19-2.2-4.09-6.25-7.12-13.55-11.17-1.57-.88-3.6-1.33-6.42-1.57-.8-.07-1.34-.1-2.95-.19-5.77-.3-7.63-.85-7.72-3.34-.1-2.81 3.5-7.87 11.97-16.69 6.53-6.8 11.75-11.69 16.33-15.45 1.79-1.47 3.42-2.72 5.2-4.03l4.12-2.94c.79-.58 1.46-1.08 2.1-1.59 3.26-2.6 6.16-5.65 10.21-10.94a383.2 383.2 0 0 0 2.5-3.32l2.31-3.09c1.8-2.39 3.04-4 4.29-5.48 8.47-10.17 16.98-13.96 37.27-15.3-.44.02 12-.9 14.32-.98 3.62-.1 6.05.16 8.46.98.8.27 1.62.62 2.47 1.04 2.27 1.14 3.17 3.87 4.27 10.85l.44 2.76c.17 1.07.33 1.97.5 2.83 1.44 7.69 3.62 12.29 7.8 14.57 6.76 3.68 10.6 5.15 13.99 4.94 4-.25 6.99-3.17 9.3-9.67 1.45-4.04 1.46-6.49.32-7.92-.9-1.12-2.28-1.62-5.57-2.27a55.8 55.8 0 0 1-2.67-.55c-2.54-.6-4.39-1.4-5.93-2.71a252.63 252.63 0 0 0-4.78-4.01 84.35 84.35 0 0 1-4.08-3.6c-2.73-2.6-3.86-4.43-3.28-5.95 1.02-2.64 7.82-3.54 18.93-3.37a230.56 230.56 0 0 1 16.73.88c2.76.39 3.2.49 3.68.6 1.4.3 2.95.62 4.62.91a82.9 82.9 0 0 0 14.56 1.32c5.56-.04 10.24-.86 13.73-2.6 8.1-4.05 15.89-6.9 22.17-7.56.7-.07 1.4-.11 2.05-.13v1zm0-100.94v1.5c-8.62 16.05-17.27 29.55-23.65 35.92-3.19 3.2-7.62 4.9-13.54 5.56-4.45.48-8.28.4-19.18-.2-9.91-.55-15.32-.44-20.52.78a84.05 84.05 0 0 1-15 2.11l-2.25.14c-12.49.75-19.37 1.78-32.72 5.74-4.5 1.33-9.27 2.49-14.3 3.48a246.27 246.27 0 0 1-32.6 3.97c-7.56.45-13.21.57-20.24.57-5.4 0-11.9 1.61-18 5.18-8.3 4.87-15.06 12.87-19.53 24.5a68.57 68.57 0 0 1-4.56 9.8c-3.6 6.2-6.92 8.99-13.38 12.18l-4.03 1.96a64.48 64.48 0 0 0-15.16 10.25c-8.2 7.33-13.72 16.63-22.54 35.6l-2.08 4.49c-7.3 15.7-11.5 23.3-17.35 29.87-7.7 8.66-20.25 14.42-40.31 20.08-4.37 1.23-19.04 5.08-19.24 5.13-6.92 1.87-11.68 3.34-15.63 4.92-10.55 4.22-18.71 10.52-36.38 26.52l-1.7 1.54c-8.58 7.76-13.41 11.9-18.81 15.88-3.95 2.9-8 5.67-12.97 8.91-2.06 1.34-10.3 6.6-12.33 7.94-11.52 7.5-18.53 13.04-24.62 20.08a62.01 62.01 0 0 0-6.44 8.85c-4.13 6.91-6.27 13.15-9.2 25.11l-1.54 6.26c-.6 2.45-1.15 4.54-1.72 6.58-2.97 10.7-6.9 17.36-14.78 26.91L69.6 491a148.51 148.51 0 0 0-4.19 5.3 23.9 23.9 0 0 0-3.44 6.28c-1.16 3.23-1.52 5.9-1.87 11.94-.58 10.05-1.42 15.04-4.63 22.67-1.57 3.72-5.66 14.02-6.41 15.8a73.46 73.46 0 0 1-3.57 7.4c-2.88 5.14-6.71 10.12-13.12 16.95-5.96 6.36-8.87 10.9-10.61 16a56.88 56.88 0 0 0-1.38 4.82l-.46 1.84h-1.03l.52-2.08c.52-2.09.92-3.49 1.4-4.9 1.8-5.25 4.78-9.9 10.84-16.36 6.35-6.78 10.13-11.7 12.97-16.77a72.5 72.5 0 0 0 3.52-7.29c.75-1.76 4.84-12.06 6.4-15.8 3.17-7.5 3.99-12.4 4.56-22.33.35-6.14.72-8.88 1.93-12.23a24.9 24.9 0 0 1 3.58-6.54c1.27-1.7 2.6-3.37 4.22-5.34l4.11-4.95c7.8-9.46 11.66-16 14.59-26.54.56-2.04 1.1-4.12 1.71-6.56l1.53-6.26c2.96-12.04 5.13-18.36 9.32-25.39 1.84-3.08 4-6.05 6.54-8.99 6.17-7.12 13.24-12.7 24.83-20.26 2.05-1.33 10.28-6.6 12.33-7.94 4.96-3.22 9-5.98 12.92-8.87 5.37-3.95 10.19-8.08 18.74-15.82l1.7-1.54c17.76-16.09 25.98-22.43 36.67-26.7 4-1.6 8.8-3.09 15.75-4.96.21-.06 14.87-3.9 19.22-5.13 19.9-5.61 32.32-11.31 39.85-19.78 5.76-6.48 9.93-14.02 17.18-29.64l2.09-4.5c8.87-19.07 14.44-28.46 22.77-35.9a65.48 65.48 0 0 1 15.38-10.4l4.04-1.97c6.3-3.1 9.47-5.77 12.96-11.77a67.6 67.6 0 0 0 4.48-9.67c4.56-11.84 11.47-20.02 19.97-25 6.25-3.66 12.93-5.32 18.5-5.32 7.01 0 12.65-.12 20.17-.57a245.3 245.3 0 0 0 32.47-3.96c5-.98 9.75-2.13 14.22-3.45 13.43-3.98 20.38-5.02 32.94-5.78l2.24-.14c5.76-.37 9.8-.9 14.85-2.09 5.31-1.25 10.79-1.35 22.6-.7 9.04.5 12.84.58 17.21.1 5.71-.62 9.94-2.26 12.95-5.26 6.44-6.45 15.3-20.37 24.35-36.72zm0 450.21c-1.28-4.6-2.2-10.55-3.33-20.25l-.24-2.04-.23-2.03c-1.82-15.7-3.07-21.98-5.55-24.47-2.46-2.46-3.04-5.03-2.52-8.64.1-.6.18-1.1.39-2.15.69-3.54.77-5.04.08-6.84-.91-2.38-3.31-4.41-7.79-6.26-5.08-2.09-6.52-4.84-4.89-8.44.66-1.45 1.79-3.02 3.52-5.01 1.04-1.2 5.48-5.96 5.08-5.53 6.15-6.7 8.98-11.34 8.98-16.48a15.2 15.2 0 0 1 6.5-12.89v1.26a14.17 14.17 0 0 0-5.5 11.63c0 5.47-2.93 10.29-9.24 17.16.38-.42-4.04 4.33-5.07 5.5-1.67 1.93-2.75 3.43-3.36 4.77-1.37 3.04-.23 5.22 4.36 7.1 4.71 1.95 7.32 4.16 8.34 6.83.78 2.04.7 3.67-.03 7.4-.2 1.03-.3 1.51-.38 2.09-.48 3.33.03 5.59 2.23 7.8 2.74 2.74 3.98 8.96 5.84 25.06l.24 2.03.23 2.04c.82 7.01 1.53 12.06 2.34 16.03v4.33zm0-62.16c-1.4-3.13-4.43-9.9-4.95-11.17-1.02-2.53-1.25-3.8-.91-5.18.2-.84 2.05-4.68 2.32-5.33a70.79 70.79 0 0 0 3.54-11.2v3.99a62.82 62.82 0 0 1-2.62 7.6c-.31.75-2.09 4.46-2.27 5.18-.28 1.12-.08 2.22.87 4.57.41 1.02 2.5 5.7 4.02 9.09v2.45zm0-85.09c-1.65 1.66-3.66 2.9-6.4 4.13-.25.1-13.97 5.47-20.4 8.43-9.35 4.32-16.7 5.9-23.03 5.25-5.08-.53-9.02-2.25-14.77-5.92l-3.2-2.07a77.4 77.4 0 0 0-5.44-3.27c-4.05-2.18-3.25-5.8 1.47-10.47 3.71-3.68 9.6-7.93 18.73-13.8l4.46-2.82c17.95-11.33 18.22-11.5 22.27-14.74 11.25-9 19.69-14.02 26.31-15.1v1.02c-6.37 1.1-14.62 6-25.69 14.86-4.1 3.28-4.34 3.44-22.36 14.8a652.4 652.4 0 0 0-4.45 2.83c-9.07 5.83-14.92 10.05-18.57 13.66-4.31 4.28-4.95 7.13-1.7 8.88 1.7.91 3.29 1.88 5.5 3.3l3.2 2.08c5.64 3.59 9.45 5.25 14.34 5.76 6.13.64 13.32-.9 22.52-5.15 6.46-2.98 20.18-8.35 20.4-8.44 3.04-1.37 5.1-2.71 6.81-4.69v1.47zm0-41.37v1c-6.56.26-12.11 3.13-19.71 9.08l-4.63 3.68a51.87 51.87 0 0 1-4.4 3.14c-.82.52-5.51 3.33-6.22 3.76-3.31 2-6.15 3.8-8.87 5.6a112.61 112.61 0 0 0-8.16 5.92c-4.61 3.72-7.4 6.9-7.97 9.35-.63 2.67 1.48 4.53 7.05 5.46 10.7 1.78 20.92-.05 30.45-4.65a61.96 61.96 0 0 0 17.1-12.2 41.8 41.8 0 0 0 5.36-7.42v1.92a38.94 38.94 0 0 1-4.64 6.19 62.95 62.95 0 0 1-17.39 12.41c-9.7 4.68-20.13 6.55-31.05 4.73-6.06-1-8.65-3.29-7.85-6.67.64-2.74 3.53-6.05 8.31-9.9 2.35-1.9 5.1-3.88 8.24-5.97 2.73-1.82 5.58-3.61 8.9-5.62.72-.44 5.4-3.24 6.22-3.75 1.26-.8 2.6-1.76 4.3-3.09.8-.62 3.9-3.1 4.63-3.67 7.77-6.1 13.49-9.04 20.33-9.3zm0-154.6v1c-1.75-.24-4.3.23-7.82 1.55-10.01 3.75-13.8 5.07-19.15 6.76-1.78.56-2.63.83-3.87 1.24-1.48.5-3.16.76-6.74 1.16a1550.34 1550.34 0 0 0-2.64.3c-7.8.94-11.28 2.47-11.28 6.07 0 4.45 2.89 13.18 7.96 25.81a57.34 57.34 0 0 1 2.33 7.6 258.32 258.32 0 0 1 .84 3.46c1.86 7.62 3.17 10.71 5.56 11.67 2.21.88 4.7.6 7.47-.72 3.48-1.69 7.22-4.94 11.2-9.47 1.52-1.7 2.97-3.49 4.59-5.57l3.16-4.1c2.59-3.23 6.07-12.21 8.39-20.23v3.45c-2.29 7.2-5.27 14.5-7.61 17.41-.44.55-2.67 3.46-3.15 4.09-1.63 2.1-3.1 3.9-4.62 5.62-4.08 4.61-7.9 7.94-11.53 9.7-2.99 1.44-5.77 1.75-8.28.74-2.84-1.13-4.2-4.34-6.15-12.35a2097.48 2097.48 0 0 1-.84-3.46c-.8-3.2-1.47-5.45-2.28-7.46-5.14-12.8-8.04-21.55-8.04-26.19 0-4.37 3.84-6.06 12.16-7.07a160.9 160.9 0 0 1 2.65-.3c3.5-.39 5.15-.64 6.53-1.1 1.26-.42 2.1-.7 3.88-1.26 5.34-1.68 9.11-3 19.1-6.74 3.53-1.32 6.22-1.84 8.18-1.61zM0 292c10.13-11.31 18.13-23.2 23.07-35.39 3.3-8.14 6.09-16.12 10.81-30.55l1.59-4.84c6.53-19.94 10.11-29.82 14.77-39.56 6.07-12.72 12.55-21.18 20.27-25.54 6.66-3.76 10.2-7.86 12.22-13.15a46.6 46.6 0 0 0 1.86-6.58c1.23-5.2 2.05-7.59 3.93-10.36 2.45-3.62 6.27-6.53 12.1-8.96 15.78-6.58 16.73-7.04 18.05-9.01.65-.98.83-2.15.74-4.51-.03-.73-.23-3.82-.24-4A93.8 93.8 0 0 1 119 94c0-10.04.18-11.37 2.37-13.15.52-.42 1.13-.8 2.07-1.3.27-.14 2.18-1.12 2.84-1.48a68.4 68.4 0 0 0 9.12-5.87c2.06-1.54 2.64-2.14 8.01-7.93 3.78-4.09 6.21-6.36 8.96-8.12 3.64-2.33 7.2-3.12 10.9-2.11 4.4 1.2 10.81 2 18.78 2.46 6.9.4 12.9.5 21.95.5 4.87 0 8.97.47 15.4 1.57 7.77 1.33 9.3 1.54 12.38 1.54 4.05 0 7.43-.88 10.68-2.95 5.06-3.22 8.11-4.67 11.2-5.2 3.62-.64 4.77-.46 16.55 2.06 17.26 3.7 30.85 1.36 41.06-9.7 5.1-5.53 5.48-8.9 3.48-14.8-.83-2.42-1.03-3.1-1.17-4.3-.29-2.52.5-4.71 2.71-6.93 2.65-2.65 4.72-9.17 6.22-18.29h2.03c-1.56 9.71-3.77 16.65-6.83 19.7-1.79 1.8-2.36 3.39-2.14 5.28.11 1 .3 1.63 1.07 3.9 2.22 6.53 1.76 10.66-3.9 16.8-10.77 11.66-25.07 14.13-42.95 10.3-11.42-2.45-12.55-2.62-15.78-2.06-2.77.48-5.62 1.84-10.47 4.92a20.93 20.93 0 0 1-11.76 3.27c-3.25 0-4.81-.22-12.73-1.57C212.74 59.46 208.73 59 204 59c-9.1 0-15.11-.1-22.07-.5-8.09-.47-14.62-1.29-19.2-2.54-5.62-1.53-10.17 1.38-17.85 9.66-5.5 5.94-6.08 6.53-8.28 8.18a70.38 70.38 0 0 1-9.38 6.03c-.68.37-2.58 1.35-2.84 1.49-.84.44-1.35.76-1.75 1.08C121.16 83.6 121 84.8 121 94c0 1.85.06 3.54.17 5.44 0 .17.2 3.28.24 4.03.1 2.75-.13 4.29-1.08 5.71-1.67 2.5-2.27 2.8-18.95 9.74-5.48 2.29-8.99 4.96-11.2 8.24-1.71 2.51-2.47 4.73-3.64 9.7-.83 3.5-1.21 4.92-1.94 6.83-2.18 5.73-6.05 10.19-13.1 14.18-7.3 4.12-13.55 12.28-19.46 24.66-4.6 9.64-8.17 19.46-14.67 39.32l-1.58 4.84c-4.75 14.47-7.54 22.48-10.86 30.69-5.28 13.01-13.95 25.65-24.93 37.6v-2.97zm0 78v-.5l1-.01c6.32 0 7.47 5.2 4.6 13.36a60.36 60.36 0 0 1-5.6 11.3v-1.92a57.76 57.76 0 0 0 4.65-9.72c2.69-7.6 1.71-12.02-3.65-12.02-.34 0-.67 0-1 .02v-46.59a340.96 340.96 0 0 0 13.71-8.34c13.66-9.46 29.79-37.6 29.79-53.59 0-18.1 21.57-72.64 32.23-79.42 12.71-8.09 32.24-27.96 35.8-37.75 1.93-5.3 5.5-7.27 14.42-9.37 6.15-1.44 8.64-2.42 10.67-4.79 1.5-1.74 2.72-4.79 4.33-10.3.23-.78 1.9-6.68 2.43-8.46 3.62-12.08 7.3-18.49 13.47-20.39 2.5-.76 3.03-.98 9.74-3.7 7.49-3.03 11.97-4.43 17.12-4.92 6.75-.65 13.13.75 19.55 4.67 5.43 3.32 12.19 4.72 20.17 4.56 6.03-.12 12.2-1.07 19.83-2.8 1.82-.4 7.38-1.74 8.26-1.94 2.69-.6 4.34-.89 5.48-.89 4.97 0 8.93-.05 14.2-.27 7.9-.32 15.56-.92 22.75-1.88 8.5-1.14 15.9-2.73 21.88-4.82 18.9-6.62 32.64-18.3 33.67-27.59.29-2.56.4-2.96 2.79-11.11 2.33-7.95 3.21-12.93 2.72-18.23-.2-2.24-.69-4.38-1.48-6.42-1.5-3.92-2.63-9.4-3.43-16.18h.9c.77 6.47 1.89 11.72 3.47 15.82a24.93 24.93 0 0 1 1.54 6.69c.5 5.46-.4 10.54-2.77 18.6-2.36 8.06-2.47 8.47-2.74 10.95-1.09 9.75-15.1 21.68-34.33 28.41-6.06 2.12-13.52 3.72-22.09 4.87-7.22.96-14.92 1.57-22.83 1.89-5.3.21-9.27.27-14.25.27-1.04 0-2.64.27-5.26.87-.87.2-6.43 1.53-8.26 1.94-7.68 1.73-13.92 2.7-20.03 2.82-8.15.17-15.1-1.27-20.71-4.7-6.23-3.81-12.4-5.16-18.93-4.54-5.04.48-9.44 1.86-16.84 4.86-6.75 2.74-7.29 2.95-9.82 3.73-5.73 1.76-9.28 7.96-12.81 19.72-.53 1.77-2.2 7.66-2.43 8.46-1.66 5.65-2.91 8.78-4.53 10.67-2.22 2.58-4.84 3.62-12.01 5.3-7.8 1.83-11.13 3.66-12.9 8.54-3.65 10.04-23.32 30.06-36.2 38.25C65.94 190 44.5 244.2 44.5 262c0 16.34-16.3 44.78-30.22 54.41-2.14 1.48-8.24 5.12-14.28 8.68v-1.16 46.09zm0-173.7v-1.11c7.42-3.82 14.55-10.23 21.84-18.98 3.8-4.56 14.21-18.78 15.79-20.55 1.8-2.04 4.06-3.96 7.42-6.45 1.08-.8 4.92-3.57 5.49-3.99 9.36-6.85 14-11.96 15.98-19.36.8-2.98 1.54-6.78 2.46-12.3.23-1.44 2-12.46 2.56-15.79 2.87-16.77 5.73-26.79 10.07-32.1C92.46 52.43 101.5 38.13 101.5 33c0-2.54.34-3.35 6.05-15.71.68-1.49 1.25-2.74 1.77-3.93 2.5-5.75 3.9-10.04 4.14-13.36h1c-.23 3.48-1.66 7.87-4.23 13.76-.52 1.2-1.09 2.45-1.78 3.95-5.54 12.01-5.95 12.99-5.95 15.29 0 5.47-9.09 19.84-20.11 33.31-4.2 5.12-7.03 15.06-9.86 31.64-.57 3.33-2.33 14.33-2.57 15.78-.92 5.56-1.67 9.38-2.48 12.4-2.05 7.68-6.82 12.93-16.35 19.91l-5.49 3.98c-3.3 2.45-5.51 4.34-7.27 6.31-1.53 1.73-11.94 15.93-15.76 20.53-7.52 9.02-14.88 15.6-22.61 19.46zm0 361.83v-4.33c.48 2.36 1 4.35 1.6 6.15 2 6.03 4.6 8.26 8.19 6.59C28.76 557.69 43.5 542.4 43.5 527c0-16.2 6.37-31.99 17.1-46.3 1.88-2.5 3.66-4.4 5.53-6 .73-.62 1.45-1.18 2.3-1.8l2-1.43c3.68-2.68 5.32-5.28 7.08-12.59.75-3.07 1.38-5.02 4.2-13.26l.63-1.88c3.24-9.58 4.56-14.97 4.17-18.65-.48-4.43-3.8-5.23-11.3-1.64a81.12 81.12 0 0 1-9.15 3.7c-13.89 4.67-26.96 5.8-42.66 5.42l-1.95-.05-1.45-.02a39.8 39.8 0 0 0-15.05 2.96A21.81 21.81 0 0 0 0 438.37v-1.26a23.55 23.55 0 0 1 4.55-2.57 40.77 40.77 0 0 1 16.92-3.02l1.95.05c15.6.38 28.57-.75 42.32-5.37a80.12 80.12 0 0 0 9.04-3.65c8.04-3.84 12.16-2.85 12.72 2.43.42 3.89-.92 9.34-4.21 19.08l-.64 1.88c-2.8 8.2-3.43 10.15-4.16 13.18-1.82 7.52-3.59 10.34-7.47 13.16l-2 1.43c-.84.6-1.54 1.15-2.25 1.75a35.45 35.45 0 0 0-5.37 5.84c-10.61 14.15-16.9 29.74-16.9 45.7 0 15.88-15 31.45-34.29 40.45-4.3 2.01-7.39-.66-9.56-7.18-.23-.68-.44-1.39-.65-2.13zm0-62.16v-2.45l1.46 3.27c2.1 4.8 3.46 10.33 4.26 16.77.66 5.3.84 9.3 1.04 18.5.2 9.32.5 12.75 1.63 15.05 1.28 2.6 3.67 2.35 8.29-1.5 17.14-14.3 21.82-22.9 21.82-38.62 0-7.17 1.1-12.39 3.7-17.68 2.27-4.67 3.65-6.62 13.4-19.62a69.8 69.8 0 0 1 7.6-8.79 44.76 44.76 0 0 1 3.54-3.06c.38-.3.64-.52.89-.74a10.47 10.47 0 0 0 2.63-3.32 35.78 35.78 0 0 0 2.26-5.94l.37-1.2.36-1.15c.29-.91.48-1.55.66-2.16.45-1.53.74-2.68.91-3.66.38-2.2.12-3.49-.85-4.15-2.35-1.61-9.28-.24-23.8 4.94-9.54 3.4-16.12 4.17-27.85 4.26-7.71.06-10.43.4-13.25 2.12-3.48 2.12-5.84 6.4-7.58 14.26-.5 2.2-.99 4.19-1.49 5.98v-3.98l.51-2.22c1.8-8.1 4.28-12.6 8.04-14.9 3.04-1.85 5.86-2.2 13.77-2.26 11.61-.09 18.1-.84 27.51-4.2 14.93-5.32 21.95-6.71 24.7-4.83 1.38.94 1.71 2.6 1.28 5.15a33.69 33.69 0 0 1-.94 3.78l-.66 2.17-.36 1.15-.37 1.2a36.64 36.64 0 0 1-2.33 6.1c-.8 1.53-1.61 2.52-2.86 3.61l-.92.77-1.02.83c-.9.74-1.65 1.4-2.47 2.18a68.84 68.84 0 0 0-7.48 8.66c-9.7 12.93-11.07 14.87-13.31 19.46-2.52 5.15-3.59 10.22-3.59 17.24 0 16.04-4.82 24.91-22.18 39.38-5.04 4.2-8.18 4.55-9.83 1.18-1.22-2.5-1.52-5.94-1.73-15.47-.2-9.16-.38-13.15-1.03-18.4-.79-6.34-2.12-11.8-4.19-16.49L0 495.98zM379.27 0h1.04l1.5 5.26c3.28 11.56 4.89 19.33 5.26 27.8.49 11.01-1.52 21.26-6.63 31.17-7.8 15.13-20.47 26.5-36.22 34.1-12.38 5.96-26.12 9.17-36.22 9.17-6.84 0-17.24 1.38-37.27 4.62l-2.27.37c-24.5 3.99-31.65 5-37.46 5-3.49 0-4.08-.08-19.54-2.8-3.56-.64-6.32-1.1-9-1.5-20.23-2.96-31-1.2-31.96 7.86-.1.85-.18 1.72-.29 2.81l-.27 2.73c-1.1 10.9-2.02 15.73-4.31 19.96-2.9 5.34-7.77 7.95-15.63 7.95-10.2 0-12.92.6-15.5 3.17.52-.51-5.03 5.85-8.16 8.7-2.75 2.5-14.32 12.55-15.77 13.83a341.27 341.27 0 0 0-6.54 5.92c-6.97 6.49-11.81 11.76-14.6 16.15-5.92 9.3-10.48 18.04-11.69 24.08-1.66 8.3 3.67 9.54 19.02 1.21a626.23 626.23 0 0 1 44.54-21.9c3.5-1.56 14.04-6.2 15.68-6.95 5.05-2.25 8.3-3.8 10.78-5.15l1.95-1.07 2.18-1.18c1.76-.94 3.38-1.76 5-2.55 18.1-8.72 34.48-10.46 50.33-1.2 22.89 13.34 38.28 37.02 38.28 56.44 0 19.12-.73 25.13-5.18 33.2a45.32 45.32 0 0 1-4.94 7.12c-6.47 7.77-11.81 16.2-12.76 21.27-1.2 6.34 4.69 7.03 20.17-.05 13.31-6.08 22.4-14.95 28.5-26.32a80.51 80.51 0 0 0 6.1-15.13c.9-2.98 3.17-11.65 3.41-12.48a29.02 29.02 0 0 1 1.75-4.83c7.47-14.93 21.09-30.5 36.25-37.24 7.61-3.38 13-9.65 19.4-20.79.84-1.48 4.26-7.64 5.14-9.17 3.52-6.1 6.22-9.7 9.37-11.98 10.15-7.4 28.7-11.1 50.29-11.1 7.52 0 16.54-1.24 27.51-3.58a420.1 420.1 0 0 0 14.96-3.52c-1.3.33 15.54-3.98 19.42-4.89 14.15-3.33 41.07-5.01 64.11-5.01 17.36 0 27.82-9.23 38.53-38.67 6.62-18.21 6.62-26.37 2.69-34.35l-1.18-2.37A13.36 13.36 0 0 1 587.5 58c0-4.03 0-4.01 2.5-24.56.46-3.73.8-6.74 1.12-9.64.9-8.45 1.38-15.2 1.38-20.8 0-.94-.02-1.94-.04-3h1c.03 1.06.04 2.06.04 3 0 5.65-.48 12.43-1.39 20.9-.3 2.91-.66 5.93-1.11 9.66-2.5 20.45-2.5 20.47-2.5 24.44 0 1.97.45 3.57 1.45 5.68.24.51 1.16 2.35 1.17 2.36 4.06 8.24 4.06 16.68-2.65 35.13-10.84 29.8-21.63 39.33-39.47 39.33-22.96 0-49.83 1.68-63.89 4.99-3.86.9-20.69 5.2-19.4 4.88a421.05 421.05 0 0 1-14.99 3.53c-11.04 2.35-20.11 3.6-27.72 3.6-21.4 0-39.76 3.67-49.7 10.9-3 2.19-5.64 5.7-9.1 11.68-.87 1.52-4.29 7.68-5.14 9.17-6.49 11.3-12 17.71-19.86 21.2-14.9 6.63-28.38 22.03-35.75 36.77a28.17 28.17 0 0 0-1.69 4.67c-.23.8-2.5 9.49-3.4 12.5a81.48 81.48 0 0 1-6.19 15.3c-6.2 11.56-15.44 20.58-28.96 26.76-16.1 7.36-23 6.55-21.58-1.04 1-5.29 6.4-13.83 12.99-21.73a44.33 44.33 0 0 0 4.82-6.96c4.35-7.88 5.06-13.77 5.06-32.72 0-19.04-15.19-42.4-37.72-55.55-15.57-9.08-31.62-7.38-49.45 1.21a132.9 132.9 0 0 0-7.14 3.71l-1.95 1.07a158.83 158.83 0 0 1-10.85 5.19c-1.65.74-12.18 5.38-15.69 6.95a625.25 625.25 0 0 0-44.46 21.86c-15.95 8.66-22.37 7.16-20.48-2.29 1.24-6.2 5.83-15.02 11.82-24.42 2.85-4.48 7.74-9.8 14.77-16.34 1.98-1.85 4.12-3.79 6.56-5.94 1.46-1.29 13.02-11.33 15.75-13.82 3.09-2.8 8.6-9.14 8.14-8.67 2.82-2.82 5.75-3.46 16.2-3.46 7.5 0 12.04-2.43 14.75-7.42 2.2-4.07 3.11-8.84 4.2-19.59l.26-2.73.3-2.81c.56-5.42 4.47-8.5 11.23-9.6 5.44-.88 12.51-.51 21.86.86 2.7.4 5.47.86 9.04 1.49 15.33 2.7 15.96 2.8 19.36 2.8 5.73 0 12.9-1.03 37.3-5l2.27-.36c20.1-3.26 30.52-4.64 37.43-4.64 9.95 0 23.54-3.18 35.78-9.08 15.57-7.5 28.09-18.73 35.78-33.65 5.02-9.75 7-19.82 6.51-30.67-.37-8.37-1.96-16.08-5.23-27.57L379.27 0zm13.68 0h1.02c.78 3.9 1.92 8.7 3.51 14.88 3.63 14.05 3.06 27.03-.75 38.77a61 61 0 0 1-11.35 20.68 138.36 138.36 0 0 1-19.32 18.77c-11.32 9.02-23.36 15.49-35.95 18.39a258.63 258.63 0 0 1-22.57 4.07c-3.17.44-6.36.85-10.3 1.32l-9.39 1.12c-11.53 1.41-17.45 2.55-21.64 4.46-9.28 4.21-28.35 6.04-49.21 6.04-1.37 0-2.8-.12-4.3-.35-2.62-.41-5-1.03-9.14-2.29-7.34-2.21-9.63-2.75-12.63-2.56-3.9.23-6.63 2.29-8.47 6.89-1.86 4.66-2.42 7.53-3.34 14.98-1.1 8.98-2.87 12.12-9.97 14.3a40.12 40.12 0 0 0-6.8 2.66c-.63.33-1.16.64-1.76 1.02l-1.34.86c-1.9 1.14-3.86 1.49-9.25 1.49-3.2 0-8.83-.55-9.51-.39-1.22.28-.75-.14-7.14 6.24-1.5 1.5-3.49 3.18-6.32 5.37-1.52 1.18-7.16 5.43-7.94 6.03-4.96 3.78-8.33 6.6-11.06 9.38-4.88 4.98-6.85 9.15-5.56 12.7 1.34 3.67 4.07 4.42 8.9 2.82a55.72 55.72 0 0 0 7.77-3.48c1.5-.77 7.78-4.13 9.37-4.96a116.8 116.8 0 0 1 12.31-5.68 162.2 162.2 0 0 0 11.04-4.84c2.04-.97 10.74-5.16 13-6.22 4.41-2.1 8.1-3.78 11.65-5.29 17.14-7.3 29.32-9.9 37.67-6.65l5.43 2.1c2.3.88 4.17 1.62 6.02 2.38a150.9 150.9 0 0 1 13.07 6c18.34 9.63 30.35 22.13 34.79 39.87 6.96 27.85 3.6 45.53-8.08 62.4-3.97 5.75-3.52 9.2.06 8.97 4.14-.28 10.21-4.95 15.11-12.52 3.1-4.8 5.1-10.45 8.05-21.53l1.69-6.35c.66-2.47 1.24-4.52 1.83-6.5 4.93-16.56 11-27.28 21.56-34.76 7.15-5.06 23.73-15.5 25.48-16.75 6.74-4.81 10.53-9.44 14.34-18 7.74-17.44 21.09-24.34 44.47-24.34 9.36 0 17.91-1.13 29.53-3.49a624.86 624.86 0 0 0 6.2-1.28c2.4-.5 4.07-.84 5.66-1.13 4.03-.74 7.04-1.1 9.61-1.1 4.44 0 9.39-1 31.39-5.99l2.95-.66c16.34-3.67 25.64-5.35 31.66-5.35 1.54 0 2.4.01 6.4.1 7.8.15 12.27.13 17.33-.2 16.41-1.06 26.73-5.36 29.8-14.56a87.1 87.1 0 0 1 3.55-8.83c-.15.31 2.29-4.96 2.9-6.38 5.38-12.3 5.57-21.92-1.44-39.44a86.4 86.4 0 0 1-5.26-20.72c-1.61-11.98-1.38-23.14.1-40.35l.2-2.12h1l-.2 2.2c-1.48 17.15-1.7 28.24-.11 40.14a85.4 85.4 0 0 0 5.2 20.47c7.1 17.78 6.91 27.67 1.43 40.22-.62 1.43-3.06 6.72-2.91 6.4a86.17 86.17 0 0 0-3.52 8.73c-3.23 9.72-13.9 14.15-30.68 15.24-5.1.33-9.58.35-17.42.2-3.98-.09-4.84-.1-6.37-.1-5.91 0-15.18 1.67-31.44 5.32l-2.95.67c-22.16 5.02-27.05 6.01-31.61 6.01-2.5 0-5.45.36-9.43 1.09-1.58.29-3.25.62-5.64 1.11a4894.21 4894.21 0 0 0-6.2 1.29c-11.68 2.37-20.3 3.51-29.73 3.51-23.02 0-36 6.71-43.53 23.66-3.9 8.8-7.82 13.58-14.7 18.5-1.78 1.27-18.36 11.7-25.48 16.75-10.34 7.32-16.3 17.87-21.19 34.23-.58 1.96-1.15 4-1.82 6.47l-1.69 6.35c-2.98 11.18-5 16.9-8.17 21.81-5.05 7.81-11.37 12.68-15.89 12.98-4.7.31-5.3-4.23-.94-10.53 11.52-16.64 14.82-34.03 7.92-61.6-4.35-17.42-16.16-29.72-34.27-39.22-4-2.1-8.2-4-12.99-5.97-1.84-.75-3.7-1.49-6-2.38l-5.43-2.08c-8.03-3.12-20.02-.58-36.92 6.63-3.52 1.5-7.21 3.19-11.61 5.27l-13 6.22c-4.71 2.22-8.16 3.75-11.11 4.88a115.87 115.87 0 0 0-12.21 5.63c-1.58.83-7.86 4.18-9.37 4.96a56.55 56.55 0 0 1-7.9 3.54c-5.3 1.75-8.62.85-10.17-3.43-1.46-4.02.66-8.5 5.8-13.74 2.75-2.82 6.16-5.66 11.15-9.48.79-.6 6.43-4.85 7.94-6.02a66.96 66.96 0 0 0 6.23-5.28c6.74-6.74 6.1-6.16 7.61-6.51.87-.2 6.69.36 9.74.36 5.22 0 7.03-.32 8.74-1.35l1.31-.84c.62-.4 1.18-.72 1.84-1.07a41.07 41.07 0 0 1 6.96-2.72c6.64-2.04 8.22-4.84 9.28-13.47.93-7.53 1.5-10.47 3.4-15.24 1.99-4.95 5.04-7.26 9.34-7.51 3.17-.2 5.5.35 12.97 2.6a63.54 63.54 0 0 0 9.02 2.26c1.45.22 2.83.34 4.14.34 20.71 0 39.7-1.82 48.8-5.96 4.32-1.96 10.29-3.1 21.93-4.53l9.4-1.12c3.92-.48 7.11-.88 10.27-1.32 8.16-1.14 15.4-2.43 22.49-4.06 12.42-2.86 24.33-9.26 35.55-18.2a137.4 137.4 0 0 0 19.18-18.64 60.02 60.02 0 0 0 11.15-20.32c3.76-11.57 4.32-24.36.75-38.23A284.86 284.86 0 0 1 392.95 0zM506.7 0h1.26c-.5.66-.9 1.18-1.17 1.51-3.95 4.96-6.9 7.92-9.82 9.57A10.02 10.02 0 0 1 492 12.5c-2.38 0-4.24.67-6.71 2.21l-2.65 1.71c-4.38 2.8-8.01 4.08-13.64 4.08-5.6 0-9.99-1.26-16.08-4.05a202.63 202.63 0 0 1-2.3-1.06l-2.18-.98c-1.6-.7-2.92-1.17-4.17-1.48a13.42 13.42 0 0 0-3.27-.43c-2.3 0-4.3-.68-11-3.37l-1.56-.62c-5-1.97-8.1-2.82-10.52-2.66-2.93.2-4.42 2.03-4.42 6.15 0 20.76-5.21 50.42-12.15 57.35-7.58 7.59-26.55 23.7-34.06 29.06-13.16 9.4-31.17 20.2-44.11 25.06a106.87 106.87 0 0 1-13.32 4.03c-3.28.78-6.6 1.43-11.25 2.24-.53.1-8.8 1.5-11.5 1.99-4.86.87-9.3 1.74-14 2.76-20.62 4.48-25.07 5.01-38.11 5.01-2.49 0-2.9-.07-14.05-2-2.42-.42-4.31-.73-6.15-1-8.11-1.19-13.83-1.36-17.64-.2-4.54 1.4-5.93 4.65-3.7 10.52 2.02 5.28 4.84 8.61 8.84 10.74 3.26 1.74 6.75 2.6 13.82 3.71 9.42 1.48 10.94 1.75 15.5 2.92a78.2 78.2 0 0 1 18.62 7.37c8.3 4.58 14.58 11.5 19.98 20.89 2.73 4.73 9.46 19.33 10.54 21.19 3.4 5.85 6.26 6.63 10.89 2 4.95-4.94 10.35-8.37 21.13-14.06.47-.25 2.06-1.1 2.12-1.12 7.98-4.21 11.92-6.51 15.87-9.54 5.11-3.9 8.66-8.1 10.77-13.11 8.52-20.24 20.75-33.31 32.46-33.31l5.5.03c10.53.08 17.35.02 24.9-.31 13.66-.62 23.78-2.09 29.39-4.67 5.85-2.7 13.42-5.49 24.18-9.02 3.46-1.14 6.29-2.05 12.7-4.1 7.7-2.45 11.08-3.54 15.17-4.9a1059.43 1059.43 0 0 1 11.33-3.72c3.67-1.2 5.96-2 8.03-2.78a59.88 59.88 0 0 0 6.66-2.94c1.87-.98 3.76-2.1 5.86-3.5 3.48-2.33 6.15-3.13 12.04-4.13l1.15-.2c5.71-1.01 9-2.3 12.76-5.63 7.82-6.96 8.58-23.18 3.84-44.52-1.7-7.67-2.1-19.28-1.57-35.47A837.22 837.22 0 0 1 546.76 0h1l-.15 3.06c-.32 6.42-.53 11.02-.68 15.62-.51 16.1-.12 27.65 1.56 35.21 4.82 21.68 4.04 38.2-4.16 45.48-3.91 3.48-7.37 4.84-13.24 5.87l-1.16.2c-5.76.99-8.32 1.75-11.65 3.98a63.73 63.73 0 0 1-5.96 3.56 60.86 60.86 0 0 1-6.77 2.99c-2.09.79-4.39 1.58-8.07 2.79a5398.31 5398.31 0 0 1-11.32 3.71c-4.1 1.37-7.48 2.46-15.18 4.92-6.42 2.04-9.24 2.95-12.7 4.08-10.73 3.53-18.27 6.3-24.07 8.98-5.76 2.66-15.97 4.14-29.77 4.77-7.56.33-14.4.39-24.95.31l-5.49-.03c-11.19 0-23.16 12.79-31.54 32.7-2.19 5.19-5.84 9.52-11.08 13.52-4.02 3.07-7.99 5.39-16.01 9.62l-2.12 1.12c-10.7 5.65-16.04 9.04-20.9 13.9-5.14 5.14-8.75 4.15-12.45-2.22-1.12-1.92-7.85-16.5-10.54-21.2-5.33-9.24-11.48-16.02-19.6-20.5a77.2 77.2 0 0 0-18.4-7.28c-4.5-1.17-6.02-1.43-15.4-2.9-7.17-1.12-10.74-2-14.13-3.81-4.22-2.25-7.2-5.77-9.3-11.27-2.43-6.39-.78-10.26 4.34-11.83 4-1.22 9.82-1.05 18.08.17 1.84.27 3.74.58 6.17 1 11.02 1.9 11.48 1.98 13.88 1.98 12.96 0 17.35-.52 37.9-4.99 4.71-1.02 9.16-1.9 14.03-2.77 2.71-.48 10.98-1.9 11.5-1.98 4.64-.81 7.95-1.46 11.2-2.23 4.55-1.07 8.76-2.34 13.2-4 12.83-4.81 30.79-15.59 43.88-24.94 7.47-5.33 26.4-21.4 33.94-28.94C407.3 61.98 412.5 32.49 412.5 12c0-4.61 1.86-6.9 5.35-7.15 2.63-.18 5.8.7 10.96 2.73l1.56.62c6.53 2.62 8.53 3.3 10.63 3.3 1.14 0 2.3.16 3.5.46 1.32.33 2.68.82 4.34 1.53a90.97 90.97 0 0 1 3.34 1.52l1.15.54c5.98 2.73 10.23 3.95 15.67 3.95 5.41 0 8.87-1.21 13.1-3.92.2-.13 2.1-1.38 2.66-1.72 2.62-1.63 4.64-2.36 7.24-2.36 1.47 0 2.94-.43 4.47-1.3 2.78-1.56 5.67-4.45 9.54-9.31l.7-.89zM324.54 600h-2.03c.49-2.96.91-6.2 1.28-9.66.44-4.1.76-8.25.98-12.21.08-1.39.14-2.65-.35-7.29-.47-1.94-.93-4.14-1.36-6.54-2.01-11.26-2.66-22.9-1.14-33.78a60.76 60.76 0 0 1 5.18-17.95 70.78 70.78 0 0 1 12.6-18.22c3.38-3.6 5.53-5.5 11.83-10.79 4.5-3.78 6.35-5.56 7.52-7.5.64-1.07.95-2.06.95-3.06 0-1.75 0-1.74-.75-9.23-.36-3.7-.57-6.3-.68-8.96-.5-12.1 1.62-19.6 8.11-21.76 15.9-5.3 25.89-12.1 33.45-25.54C409.6 390.65 425.85 376 436 376c12.36 0 20-1.96 29.41-8.8 6.76-4.92 9.5-6.6 12.47-7.46 2.22-.64 3.8-.74 9.12-.74 1.86 0 3.53-.83 5.57-2.62 1.08-.96 5.11-5.12 5.6-5.6 6.04-5.85 11.98-8.78 20.83-8.78 2.45 0 4.54.04 7.32.12 7.51.23 8.87.17 11.27-.7 3.03-1.1 5.53-3.03 14.75-11.17 8-7.06 10.72-8.92 22.87-16.47 1.44-.9 2.59-1.63 3.69-2.37a69.45 69.45 0 0 0 9.46-7.5c4.12-3.88 8.02-7.85 11.64-11.9v2.98a201.58 201.58 0 0 1-10.27 10.38c-3.18 3-6.2 5.35-9.72 7.7-1.12.76-2.28 1.5-3.75 2.4-12.05 7.5-14.71 9.32-22.6 16.28-9.46 8.35-12.01 10.32-15.39 11.55-2.74 1-4.19 1.06-12.01.82-2.76-.08-4.83-.12-7.26-.12-8.27 0-13.75 2.7-19.43 8.22-.44.43-4.52 4.64-5.68 5.66-2.37 2.09-4.46 3.12-6.89 3.12-5.1 0-6.6.1-8.56.66-2.67.78-5.29 2.37-11.85 7.15-9.8 7.13-17.85 9.19-30.59 9.19-9.22 0-24.96 14.2-34.13 30.49-7.84 13.94-18.24 21.02-34.55 26.46-5.31 1.77-7.21 8.51-6.75 19.78.1 2.6.31 5.19.68 8.84.75 7.62.75 7.58.75 9.43 0 1.38-.42 2.73-1.24 4.09-1.33 2.2-3.26 4.07-7.94 8-6.25 5.24-8.36 7.12-11.67 10.63a68.8 68.8 0 0 0-12.25 17.71 58.8 58.8 0 0 0-5 17.36c-1.49 10.66-.85 22.09 1.13 33.15.43 2.37.88 4.53 1.33 6.44.16.66.3 1.25.6 4.06a249.3 249.3 0 0 1-1.17 16.12c-.37 3.37-.78 6.53-1.25 9.44zm-13.4 0h-1.05l.12-.28c3.07-7.16 4.29-11.83 4.29-18.72 0-3.57-.07-4.93-.76-15.65-.77-12.04-1-19.64-.55-28.3.58-11.5 2.4-22.1 5.81-32.16 1.3-3.8 2.8-7.5 4.55-11.1 3.46-7.14 6.83-12.39 10.42-16.6a59.02 59.02 0 0 1 4.35-4.56c.43-.4 3-2.8 3.67-3.45 5.72-5.6 7.51-11.52 7.51-29.18 0-18.84 2.9-23.77 15.82-28.24 1.09-.37 1.92-.67 2.77-.98a51.3 51.3 0 0 0 6.1-2.7c4.95-2.6 9.64-6.22 14.44-11.42 25.5-27.63 37.15-35.16 56.37-35.16 8.28 0 14.54-1.95 22-6.3 1.78-1.03 13.82-8.82 18.16-11.27 2.83-1.59 5.66-3.03 8.63-4.39 7.92-3.6 13.97-4.45 26.6-4.8 7.53-.2 10.7-.49 14.26-1.58 4.55-1.4 8.06-4 10.93-8.43 2.2-3.41 6.85-7.08 14.66-12.06 1.61-1.03 3.27-2.05 5.65-3.5 9.53-5.85 11.56-7.13 14.81-9.57 5.34-4 9.3-8.37 13.68-14.77a204.2 204.2 0 0 0 5.62-8.75v1.9c-1.97 3.17-3.4 5.38-4.8 7.42-4.42 6.48-8.46 10.92-13.9 15-3.29 2.46-5.32 3.75-14.89 9.61a375.06 375.06 0 0 0-5.63 3.5c-7.7 4.9-12.26 8.52-14.36 11.76-3 4.63-6.7 7.39-11.48 8.85-3.68 1.12-6.9 1.42-14.53 1.63-12.5.34-18.44 1.18-26.2 4.7a111.08 111.08 0 0 0-8.56 4.35c-4.3 2.43-16.34 10.22-18.15 11.27-7.6 4.43-14.03 6.43-22.5 6.43-18.87 0-30.3 7.4-55.63 34.84-4.88 5.28-9.67 8.97-14.7 11.62-2 1.05-4 1.92-6.23 2.75-.86.32-1.7.62-5.37 1.87-5.08 1.76-7.44 3.25-9.28 6.37-2.23 3.78-3.29 9.94-3.29 20.05 0 17.9-1.87 24.07-7.8 29.89-.69.67-3.27 3.06-3.69 3.46a58.04 58.04 0 0 0-4.28 4.49c-3.53 4.14-6.86 9.32-10.28 16.38a95.19 95.19 0 0 0-4.5 10.99c-3.38 9.97-5.18 20.48-5.76 31.9-.44 8.6-.22 16.17.55 28.17.69 10.76.76 12.12.76 15.72 0 6.35-1.02 10.87-4.35 19zm25.08 0h-1c-.04-4.73.06-9.39.28-15.02.26-6.41-.4-11.79-2.53-24.37l-.31-1.86c-2.12-12.55-2.76-19.35-1.97-26.47 1.03-9.25 4.75-16.68 12-22.67 22.04-18.2 29.81-30.18 29.81-44.61 0-2.6-.3-4.81-.98-8.17-.97-4.79-1.1-5.68-.97-7.57.2-2.56 1.27-4.7 3.56-6.72 2.67-2.35 7.05-4.6 13.72-7.01 9.72-3.5 15.52-9.18 24.3-21.57l1.78-2.5c4.48-6.33 7.1-9.63 10.43-12.78 4.31-4.07 8.98-6.77 14.54-8.17 13.3-3.32 20.37-5.47 25.34-7.64a49.5 49.5 0 0 0 5.28-2.7c1.1-.65 1.75-1.04 4.24-2.6 2.7-1.68 5.22-2.08 11.38-2.28 5.44-.18 7.9-.43 10.97-1.41a21.47 21.47 0 0 0 9.54-6.22c4.87-5.3 10.03-7.61 17.79-8.9 1.07-.18 1.88-.3 3.86-.58 6.9-.97 9.94-1.69 13.48-3.62 4.5-2.45 6.79-4.44 23.46-19.68l3.14-2.85c9.65-8.71 16.12-13.83 21.42-16.48 4.25-2.12 7.6-4.69 11.22-8.6v1.45c-3.42 3.57-6.69 6-10.78 8.05-5.18 2.59-11.61 7.67-21.2 16.32l-3.12 2.85c-16.8 15.35-19.05 17.3-23.66 19.82-3.68 2-6.8 2.75-13.82 3.73-1.97.28-2.78.4-3.84.57-7.56 1.26-12.52 3.48-17.21 8.6a22.47 22.47 0 0 1-9.97 6.5c-3.2 1-5.72 1.27-11.25 1.45-5.98.2-8.39.57-10.89 2.13a144 144 0 0 1-4.25 2.61 50.48 50.48 0 0 1-5.39 2.75c-5.04 2.2-12.15 4.37-25.5 7.7-9.74 2.44-15.26 7.65-24.4 20.56l-1.77 2.5c-8.9 12.54-14.82 18.34-24.78 21.93-6.57 2.36-10.85 4.57-13.4 6.82-2.1 1.86-3.05 3.74-3.22 6.04-.13 1.76 0 2.63.95 7.3.7 3.42 1 5.7 1 8.37 0 14.79-7.93 27-30.18 45.39-7.03 5.8-10.64 13-11.64 22-.78 7-.14 13.73 1.96 26.2l.32 1.85c2.15 12.65 2.8 18.07 2.54 24.58-.22 5.57-.32 10.2-.28 14.98zM95.9 600h-2.04c.68-3.82 1.14-8.8 1.61-15.98.2-3.11.27-4.06.39-5.6 1.3-17.54 4.04-27.14 11.5-33.2 4.65-3.77 7.22-8.92 8.67-16 .51-2.52.7-3.87 1.33-9.17.66-5.5 1.16-8.06 2.24-10.36 1.45-3.09 3.82-4.69 7.39-4.69 14.28 0 38.48 9.12 53.6 20.2 8.66 6.35 21.26 13.32 31.74 17.11 13.03 4.71 21.89 4.41 24.75-1.73 1.7-3.64 1.92-4.11 2.65-5.77 2.93-6.67 4.69-12.2 5.25-17.5.23-2.17.24-4.23.02-6.2-.32-2.75-1.42-4.55-4.08-7.35l-1.32-1.37a30.59 30.59 0 0 1-2.41-2.79 30.37 30.37 0 0 1-2.5-4.07l-1.13-2.14c-1.62-3.1-2.68-4.6-4.12-5.56-5.26-3.5-14.8-5.5-28.55-6.83a272.42 272.42 0 0 0-9.04-.71l-2.18-.17c-9.57-.73-15.12-1.56-19.06-3.2C156.57 471.07 136 450.5 136 440c0-5.34 1.74-9.53 5.47-14.13 1.98-2.44 11.12-11.71 12.79-13.54 4.52-4.97 10.16-9.54 17.68-14.66 2.8-1.9 14.78-9.6 17.49-11.49a50.54 50.54 0 0 0 6.34-5.43c1.53-1.5 6.96-7.13 7.12-7.3 7.18-7.3 12.7-11.56 19.74-14.38 3.36-1.34 8.13-2.79 17.45-5.38a9577.18 9577.18 0 0 1 11.78-3.28 602.6 602.6 0 0 0 12.67-3.7c20.4-6.24 34-12.08 40.79-18.44 8.74-8.2 11.78-13.84 15.73-26.02 2.02-6.22 3.09-9.04 5.07-12.72 9.54-17.71 28.71-39.37 43.5-45.45C383.77 238.25 389 232.34 389 226c0-2.89 2.73-8.4 6.83-13.73 4.76-6.2 10.65-11.36 16.75-14.18 12.5-5.77 33.5-10.09 47.42-10.09 5.32 0 9.83-1.5 16.42-4.89 9.2-4.71 10.1-5.11 13.58-5.11 10.42 0 32.06-2.55 45.76-5.97l3.88-.98 3.47-.89c2.6-.66 4.33-1.08 5.93-1.43 3.9-.86 6.76-1.23 9.58-1.17 2.74.06 5.47.52 8.67 1.48 4.56 1.37 13.71-.9 22.87-5.68a68.07 68.07 0 0 0 9.84-6.2v2.4c-11.09 8.14-25.76 13.66-33.29 11.4a29.72 29.72 0 0 0-8.13-1.4c-2.63-.05-5.36.3-9.11 1.12a238 238 0 0 0-9.33 2.3l-3.9.99C522.38 177.43 500.58 180 490 180c-2.99 0-3.91.4-12.67 4.89-6.85 3.51-11.61 5.11-17.33 5.11-13.65 0-34.35 4.26-46.58 9.9-5.78 2.67-11.42 7.62-16 13.58-3.85 5.02-6.42 10.2-6.42 12.52 0 7.27-5.8 13.82-20.62 19.92-14.27 5.88-33.16 27.21-42.5 44.55-1.9 3.55-2.95 6.28-4.93 12.4-4.05 12.47-7.23 18.39-16.27 26.86-7.08 6.64-20.87 12.57-41.57 18.89a604.52 604.52 0 0 1-12.7 3.71 1495.1 1495.1 0 0 1-11.8 3.28c-9.24 2.58-13.97 4.01-17.24 5.32-6.73 2.69-12.05 6.8-19.05 13.92-.15.15-5.6 5.8-7.15 7.32a52.4 52.4 0 0 1-6.6 5.65c-2.74 1.92-14.75 9.63-17.5 11.5-7.4 5.04-12.94 9.52-17.33 14.35-1.72 1.9-10.8 11.11-12.71 13.46-3.47 4.26-5.03 8.03-5.03 12.87 0 9.5 20 29.5 33.38 35.08 3.67 1.53 9.1 2.34 18.45 3.05a586.23 586.23 0 0 0 4.34.32c3.24.23 5.07.37 6.93.55 14.08 1.37 23.82 3.4 29.45 7.17 1.82 1.2 3.02 2.91 4.8 6.29l1.11 2.13a28.55 28.55 0 0 0 2.34 3.81c.62.83 1.3 1.6 2.26 2.61.23.24 1.1 1.16 1.32 1.37 2.93 3.09 4.24 5.23 4.61 8.5.24 2.12.23 4.33-.01 6.64-.59 5.55-2.4 11.25-5.41 18.1-.74 1.67-.96 2.15-2.66 5.8-3.49 7.47-13.33 7.8-27.25 2.77-10.67-3.86-23.43-10.92-32.25-17.38C164.62 515.96 140.82 507 127 507c-5 0-6.4 3.02-7.64 13.29a99.03 99.03 0 0 1-1.36 9.33c-1.53 7.5-4.3 13.04-9.37 17.16-6.87 5.58-9.5 14.78-10.77 31.8-.11 1.52-.18 2.47-.38 5.57-.46 7.01-.91 11.99-1.57 15.85zm8.05 0h-1.02c.29-1.41.58-2.94.9-4.59l1.05-5.62c2.5-13.3 4.2-19.92 6.68-24.05 1.7-2.84 3.68-5.5 8.05-11.03 8.21-10.36 10.88-14.55 10.88-18.71l-.02-1.69c-.02-1.78-.02-2.7.02-3.77.21-5.05 1.47-8.2 4.64-9.4 3.92-1.5 10.39.44 20.12 6.43 9.56 5.88 17.53 10.7 25.91 15.66 1.31.78 14.27 8.41 17.67 10.45a714.21 714.21 0 0 1 6.42 3.9c13.82 8.5 38.94 5.05 46.3-7.83 3.6-6.28 4.54-8.52 7.78-17.32a82.3 82.3 0 0 1 1.18-3.07 42.27 42.27 0 0 1 4.06-7.64c9.33-13.98 14.92-26.1 14.92-36.72 0-3.66.75-6.62 3.36-14.85.52-1.64.83-2.66 1.15-3.73 3.64-12.23 3.04-19.12-4.29-24a23.1 23.1 0 0 0-9.98-3.78c-7.2-.93-14.49 1.17-23.91 5.88-1.55.78-6.64 3.44-7.6 3.93a62.6 62.6 0 0 0-4.14 2.3l-4.4 2.66c-11.62 6.92-20.4 9.18-32.81 6.08-3.32-.84-6.24-1.4-13.1-2.64-13.25-2.39-18.7-3.75-23.33-6.46-6.23-3.67-7.46-9.02-2.88-16.65A93.1 93.1 0 0 1 172 415.42a157 157 0 0 1 8.32-7.66c-.07.05 6.16-5.3 7.82-6.77a85.12 85.12 0 0 0 6.5-6.33c7.7-8.46 12.78-13.36 20.08-18.57 9.94-7.1 21.4-12.36 35.18-15.58 37.03-8.64 51-12.7 58.83-17.93 8.6-5.73 21.3-24.77 36.84-54.81 5.22-10.1 12.27-18.4 21.13-25.71 5.13-4.24 9.56-7.25 17.55-12.23 7.42-4.62 9.62-6.14 11.38-8.16a21.15 21.15 0 0 0 2.95-4.87c.61-1.3 2.87-6.47 3-6.77 1.36-3 2.56-5.4 3.95-7.73 6.53-10.97 16.03-18 31.4-20.8 12.73-2.3 19.85-2.7 29.68-2.3 3.25.13 4.13.16 5.6.14 5.15-.07 9.71-1.04 16.61-3.8 20.74-8.3 38.75-12.04 59.19-12.04 3.05 0 6.03.15 10.48.48l2.09.16c12.45.96 18.08.96 25.34-.63a49.65 49.65 0 0 0 14.09-5.45v1.15a50.52 50.52 0 0 1-13.88 5.28c-7.38 1.61-13.08 1.61-25.63.65l-2.08-.16c-4.43-.33-7.39-.48-10.41-.48-20.3 0-38.2 3.72-58.81 11.96-7.01 2.8-11.7 3.8-16.97 3.88-1.5.02-2.39-.01-5.66-.14-9.76-.4-16.8-.01-29.47 2.3-15.06 2.73-24.32 9.58-30.71 20.31a72.8 72.8 0 0 0-3.9 7.63c-.12.28-2.39 5.47-3.01 6.79a22 22 0 0 1-3.1 5.1c-1.86 2.13-4.07 3.66-11.6 8.35-7.95 4.96-12.35 7.95-17.44 12.15-8.76 7.23-15.73 15.43-20.89 25.4-15.61 30.2-28.36 49.32-37.16 55.19-7.98 5.32-21.97 9.39-59.17 18.07-13.65 3.18-24.98 8.39-34.82 15.42-7.22 5.16-12.27 10.01-19.92 18.43a86.07 86.07 0 0 1-6.57 6.4c-1.67 1.48-7.91 6.83-7.84 6.77-3.27 2.84-5.8 5.16-8.26 7.62a92.1 92.1 0 0 0-14.27 18.13c-4.3 7.16-3.22 11.89 2.53 15.26 4.47 2.63 9.88 3.99 23.24 6.39a185.7 185.7 0 0 1 12.92 2.6c12.11 3.03 20.64.84 32.06-5.96l4.4-2.65c1.66-1 2.96-1.73 4.2-2.35.95-.48 6.04-3.14 7.6-3.92 9.59-4.8 17.04-6.94 24.49-5.98a24.1 24.1 0 0 1 10.4 3.93c7.82 5.21 8.45 12.52 4.7 25.13-.32 1.07-.64 2.1-1.16 3.74-2.57 8.12-3.31 11.04-3.31 14.55 0 10.88-5.66 23.14-15.08 37.28a41.28 41.28 0 0 0-3.97 7.46c-.37.9-.73 1.82-1.18 3.04-3.25 8.85-4.21 11.13-7.84 17.47-7.67 13.42-33.43 16.95-47.7 8.18a578.4 578.4 0 0 0-6.4-3.89c-3.4-2.04-16.36-9.67-17.67-10.45-8.38-4.97-16.36-9.78-25.92-15.66-9.5-5.85-15.7-7.7-19.24-6.36-2.68 1.02-3.8 3.82-4 8.51a61.12 61.12 0 0 0-.02 3.72l.02 1.7c0 4.5-2.69 8.73-11.52 19.87-3.92 4.95-5.87 7.59-7.55 10.39-2.39 3.97-4.08 10.56-6.56 23.72l-1.05 5.62-.86 4.4zm10.5 0h-1c.03-.34.04-.68.04-1 0-12.39 8.48-33.57 19.16-43.37a26.18 26.18 0 0 0 3.67-4.17 35.8 35.8 0 0 0 2.88-4.9c.36-.72 1.75-3.66 2.1-4.36 3.22-6.29 6.84-6.54 16.97.39 1.34.9 6.07 4.16 6.4 4.38 2.62 1.8 4.67 3.2 6.7 4.56 5.03 3.39 9.37 6.2 13.51 8.7 14.33 8.67 25.49 13.27 34.11 13.27 16.86 0 32.71-5.95 39.6-14.8 1.59-2.04 3.2-5.17 5.06-9.63.8-1.92 1.64-4.06 2.67-6.8l2.74-7.33c4.66-12.44 7.76-19.06 11.56-23.27 7.9-8.79 14.87-36 14.87-52.67 0-1.9.17-3.11 1.02-8.27.37-2.2.58-3.6.74-5.07.63-5.51.21-9.46-1.68-12.39-4.6-7.1-19.7-9.23-38.46-4.78a100.57 100.57 0 0 0-18.94 6.3c-5.17 2.37-17.11 9.74-16.5 9.4-6.72 3.64-12.97 4.15-24.8 1.3-29.55-7.14-30.43-8.62-15.26-26.81 17.44-20.93 47.12-46.18 56.38-46.18 9.92 0 53.84-11.98 65.78-17.95 9.46-4.73 24.32-21.18 36.82-37.85.71-.95 13.5-21.6 19.2-29.6 9.35-13.13 18.22-22.55 26.95-27.53 7.29-4.17 13.16-10.28 18.8-18.73 1.93-2.9 10.52-17.65 12.73-20.41 1.54-1.93 3-3.21 4.52-3.89 14.07-6.25 24.22-9.04 39.2-9.04h29c4.05 0 7.36-.4 22.93-2.5l4.3-.57c9.92-1.3 16.57-1.93 21.77-1.93 1.66 0 2.95.01 6.03.04 18.61.19 28.55-.48 44.86-4.03 3.1-.67 6.13-1.78 9.11-3.31v1.12a37.96 37.96 0 0 1-8.9 3.17c-16.4 3.56-26.4 4.24-45.08 4.05-3.08-.03-4.36-.04-6.02-.04-5.15 0-11.76.63-21.64 1.92l-4.3.58c-15.64 2.11-18.94 2.5-23.06 2.5h-29c-14.81 0-24.84 2.75-38.8 8.96-1.34.6-2.69 1.78-4.14 3.6-2.16 2.68-10.72 17.39-12.68 20.33-5.72 8.57-11.7 14.8-19.13 19.04-8.57 4.9-17.36 14.23-26.63 27.24-5.68 7.97-18.47 28.64-19.22 29.63-12.6 16.8-27.52 33.32-37.18 38.15-12.06 6.03-56.14 18.05-66.22 18.05-8.82 0-38.39 25.15-55.62 45.82-14.6 17.52-14.19 18.21 14.74 25.2 11.6 2.8 17.6 2.3 24.09-1.2-.67.35 11.31-7.03 16.56-9.44 5.41-2.48 11.6-4.59 19.11-6.37 19.13-4.53 34.65-2.35 39.54 5.22 2.05 3.17 2.48 7.32 1.84 13.04a96.34 96.34 0 0 1-.75 5.13c-.84 5.08-1.01 6.29-1.01 8.1 0 16.9-7.03 44.33-15.13 53.33-3.68 4.09-6.76 10.65-11.37 22.96-.35.93-2.2 5.94-2.73 7.33-1.04 2.76-1.88 4.9-2.68 6.84-1.9 4.53-3.55 7.73-5.2 9.85-7.1 9.13-23.25 15.19-40.39 15.19-8.86 0-20.15-4.65-34.63-13.42-4.15-2.51-8.5-5.32-13.55-8.72a861.54 861.54 0 0 1-6.71-4.56l-6.4-4.39c-9.68-6.63-12.61-6.42-15.5-.75-.35.68-1.74 3.62-2.1 4.35a36.77 36.77 0 0 1-2.96 5.03c-1.12 1.57-2.37 3-3.81 4.33-10.47 9.6-18.84 30.51-18.84 42.63l-.03 1zm-29.65 0h-1.1c1.17-2.52 1.79-5.2 1.79-8 0-20 4.83-42.04 12.15-49.35 5.17-5.18 7.77-8.38 9.9-12.74 2.64-5.41 3.95-12 3.95-20.91 0-6.82 1.14-11.59 3.37-15.07 1.74-2.7 3.6-4.21 8.91-7.52a31.64 31.64 0 0 0 3.9-2.79c4.61-3.96 6.58-6.2 7.72-9.41 1.43-4.02.93-9.04-1.86-16.02a68.98 68.98 0 0 0-3.99-8.07l-.93-1.7a75.47 75.47 0 0 1-2.64-5c-5.16-10.71-3.77-18.9 7.68-29.78a204 204 0 0 1 26.81-21.55c3.96-2.69 16.8-10.8 19.24-12.5 1.99-1.4 4.33-3.3 7.77-6.3-.02 0 7.23-6.39 9.47-8.3 4.97-4.26 9.09-7.5 13.05-10.15 4.72-3.15 8.97-5.28 12.87-6.32 12.78-3.41 15.6-4.18 21.77-5.97 12.55-3.64 21.96-6.9 28.14-10a45.47 45.47 0 0 1 7.47-2.79c8.66-2.66 12.02-4.1 16.97-8.1 6.78-5.46 13.07-14.25 19.33-27.87 15.97-34.77 19.08-39.39 32.15-49.19 3.14-2.36 6.37-4.1 11.43-6.4l2.33-1.04c11.93-5.35 16.87-8.93 21.1-17.38 1.88-3.77 2.48-6.29 3.37-12.27.78-5.19 1.48-7.56 3.53-10.25 2.57-3.4 7.03-6.27 14.36-9.01 3.37-1.26 7.36-2.5 12.05-3.73 16.33-4.3 25.28-5.36 39.6-5.81 6.9-.22 9.5-.56 12.66-2 1.19-.54 2.36-1.23 3.58-2.11 3.7-2.7 8.14-4.54 13.24-5.67 5.71-1.27 10.69-1.54 18.7-1.45l2.35.02c2.82 0 6.8-1 19.7-4.69 10.83-3.08 15.95-4.31 19.3-4.31.82 0 1.9.13 3.55.41l5.01.9c9.82 1.68 17.44 1.89 25.15-.21 7.98-2.18 14.8-6.77 20.29-14.24V147c-5.47 7.04-12.21 11.42-20.03 13.55-7.88 2.15-15.63 1.94-25.58.23l-5-.9c-1.6-.26-2.64-.39-3.39-.39-3.2 0-8.32 1.22-19.74 4.48-12.35 3.53-16.3 4.52-19.26 4.52l-2.36-.02c-7.94-.1-12.85.17-18.47 1.42-4.97 1.11-9.3 2.9-12.88 5.5a21.4 21.4 0 0 1-3.75 2.22c-3.32 1.5-6 1.87-13.04 2.09-14.25.44-23.13 1.5-39.37 5.77a125.56 125.56 0 0 0-11.95 3.7c-7.17 2.7-11.49 5.46-13.93 8.68-1.9 2.52-2.58 4.76-3.33 9.8-.9 6.08-1.53 8.68-3.47 12.56a30.6 30.6 0 0 1-9.66 11.45c-3.12 2.26-5.95 3.73-11.93 6.4l-2.31 1.04c-5.01 2.27-8.18 3.99-11.25 6.29-12.9 9.68-15.93 14.17-31.85 48.8-6.31 13.76-12.7 22.68-19.6 28.25-5.08 4.1-8.53 5.57-17.3 8.27a44.64 44.64 0 0 0-7.33 2.73c-6.24 3.12-15.7 6.4-28.3 10.06a867.4 867.4 0 0 1-21.8 5.97c-3.77 1.01-7.93 3.1-12.56 6.19a137.35 137.35 0 0 0-12.95 10.07c-2.24 1.92-9.48 8.3-9.48 8.3a98.2 98.2 0 0 1-7.84 6.37c-2.46 1.72-15.32 9.83-19.26 12.5a203 203 0 0 0-26.69 21.45c-11.13 10.58-12.43 18.3-7.47 28.63a74.52 74.52 0 0 0 2.62 4.95l.94 1.7a69.84 69.84 0 0 1 4.03 8.17c2.88 7.2 3.4 12.46 1.89 16.73-1.22 3.43-3.28 5.77-8.02 9.84-1.14.97-2.32 1.8-5.3 3.67-3.92 2.45-5.69 3.89-7.31 6.42-2.13 3.3-3.22 7.89-3.22 14.53 0 9.05-1.34 15.79-4.05 21.34-2.19 4.49-4.85 7.77-10.1 13.01-7.07 7.07-11.85 28.9-11.85 48.65 0 2.8-.58 5.48-1.7 8zm282.54 0h-1.01l-1.1-5.8c-3.08-16.26-4.05-26.2-2.74-37.26.7-5.8.77-9.68.55-15.3-.18-4.45-.17-5.68.19-7.63.78-4.3 3.44-8.53 10.39-16.34 9.07-10.2 12.26-15.41 19.8-30.15 1.35-2.64 2.33-4.47 3.38-6.3.9-1.58 1.82-3.06 2.77-4.5 3.14-4.7 7.03-8.42 16.84-16.81 11.22-9.6 15.5-13.86 18.13-19.13.7-1.4 1.3-2.8 1.93-4.4a206 206 0 0 0 1.49-4.05c3.63-9.94 8.01-13.93 22.9-17.81 4.99-1.3 20.55-5.13 21.38-5.34 16.19-4.1 25.33-7.36 33.48-12.6 5.86-3.77 5.84-3.76 27.66-16.53l2.6-1.52c10.23-6 17.1-10.2 22.73-13.95a149.3 149.3 0 0 0 8.8-6.3 723.7 723.7 0 0 0 6.37-5.08A87.74 87.74 0 0 1 600 342.95v1.12a85.76 85.76 0 0 0-15.49 9.9c.18-.14-4.76 3.84-6.38 5.1a150.3 150.3 0 0 1-8.85 6.35c-5.65 3.76-12.53 7.96-22.78 13.97l-2.6 1.53c-21.8 12.75-21.78 12.74-27.63 16.5-8.27 5.32-17.49 8.61-33.78 12.73-.83.21-16.39 4.04-21.36 5.33-8.03 2.1-13.15 4.5-16.45 7.5-2.66 2.42-4 4.86-5.77 9.7l-1.5 4.07a51.12 51.12 0 0 1-1.96 4.47c-2.72 5.45-7.04 9.75-18.38 19.45-9.73 8.32-13.6 12.02-16.65 16.6a77.18 77.18 0 0 0-2.74 4.45c-1.05 1.81-2.01 3.63-3.35 6.25-7.58 14.81-10.82 20.08-19.96 30.36-6.83 7.7-9.4 11.78-10.15 15.86-.34 1.85-.34 3.04-.17 7.4.22 5.68.14 9.6-.55 15.47-1.3 10.92-.34 20.79 2.73 36.95l1.12 5.99zm-76.59 0h-2.1l1.39-4.3c1.04-3.3 1.93-6.78 2.68-10.4 2.65-12.73 3.27-23.63 3.27-41.3 0-5.71-1.86-9.75-4.13-9.75-2.94 0-6.96 5.61-10.93 17.08C271.14 579.68 258.3 593 238 593c-22.42 0-29.26-1.35-48.42-10.09a87.69 87.69 0 0 1-9.42-5.04c-2.95-1.8-12.78-8.57-14.84-9.72-4.2-2.36-7-2.71-9.72-.99-.63.4-1.26.91-1.9 1.55a57.69 57.69 0 0 1-4.31 3.86 147.88 147.88 0 0 1-3.06 2.44l-1 .8C137.01 582.43 134 587.18 134 597c0 1.02-.02 2.01-.07 3h-2c.05-.99.07-1.98.07-3 0-10.52 3.33-15.78 12.09-22.76a265.61 265.61 0 0 1 2-1.6c.83-.64 1.43-1.13 2.03-1.61a55.76 55.76 0 0 0 4.17-3.74c.74-.73 1.48-1.34 2.24-1.82 3.47-2.2 7-1.75 11.77.93 2.15 1.21 12.03 8 14.9 9.76a85.7 85.7 0 0 0 9.22 4.93C209.29 589.7 215.85 591 238 591c19.25 0 31.49-12.7 41.06-40.33 4.24-12.25 8.66-18.42 12.81-18.42 3.8 0 6.13 5.06 6.13 11.75 0 17.8-.63 28.8-3.3 41.7-.77 3.7-1.68 7.23-2.75 10.6-.4 1.3-.8 2.53-1.19 3.7zm-149.25 0l.5-.94a160.1 160.1 0 0 0 6.53-13.26c2.73-6.29 5.78-9.64 9.24-10.52 3.74-.95 7.15.74 12.56 5.13 5.43 4.4 6.07 4.86 7.73 5.1 1.6.22 4.28 1.14 8.86 2.95 1.3.5 10.78 4.35 13.85 5.55 3.07 1.2 5.85 2.25 8.49 3.18 3.1 1.1 5.98 2.04 8.65 2.81h-3.45c-1.76-.56-3.6-1.18-5.54-1.87a281.2 281.2 0 0 1-8.51-3.19c-3.08-1.2-12.57-5.04-13.86-5.55-4.5-1.78-7.15-2.68-8.63-2.9-1.94-.27-2.53-.7-8.22-5.3-5.17-4.2-8.36-5.78-11.69-4.94-3.1.78-5.94 3.92-8.56 9.95a161 161 0 0 1-6.82 13.8h-1.13zm112.89 0a30.34 30.34 0 0 0 11.27-6.27c1.55-1.36 3.32-3.46 5.34-6.29 1.05-1.46 2.15-3.1 3.41-5.04a349.73 349.73 0 0 0 2.5-3.9l.47-.75.93-1.47a89.17 89.17 0 0 1 3.25-4.86c1.05-1.43 1.82-2.23 2.44-2.46 1.02-.37 1.49.48 1.49 2.04l.01 2.11c.05 6.91-.08 11.32-.7 16.33a48.4 48.4 0 0 1-2.38 10.56h-1.07a46.47 46.47 0 0 0 2.45-10.68c.62-4.96.75-9.33.7-16.2l-.01-2.12c0-.97-.08-1.12-.15-1.1-.36.14-1.05.85-1.97 2.1a88.44 88.44 0 0 0-3.22 4.82l-.92 1.46-.48.75a1268.1 1268.1 0 0 1-2.5 3.92c-1.26 1.95-2.38 3.6-3.44 5.08-2.06 2.88-3.87 5.04-5.5 6.45a30.87 30.87 0 0 1-8.94 5.52h-2.98zm-183.72 0H69.3c3.37-3.43 5.19-8.33 5.19-15 0-18.6-.04-17.35 1.02-20.77.6-1.93 1.5-3.74 3.27-6.63.42-.7 4.92-7.8 6.78-10.86 3.04-4.97 11.04-16.5 12.21-18.56 3.48-6.08 4.72-12.06 4.72-24.18 0-7.85 2.5-14.2 8.1-23.44l2.84-4.63a72.67 72.67 0 0 0 2.49-4.4c1.62-3.15 2.48-5.78 2.62-8.28.2-3.78-1.3-7.29-4.9-10.9-5.13-5.12-8.6-5.43-11.2-1.85-2.12 2.92-3.48 7.74-5.06 16.47-.2 1.03-.82 4.6-.82 4.57-.83 4.67-1.4 7.33-2.1 9.6-1.35 4.42-3.7 7.61-8.36 12.26l-3.26 3.2c-6.38 6.39-9.68 11.51-11.36 19.5l-1.16 5.52c-.87 4.1-1.56 7.04-2.33 9.94-3.67 13.74-9.65 25.97-22.59 44.72-7.68 11.14-11.05 18.87-10.92 23.72h-1c-.12-5.16 3.35-13.05 11.1-24.28 12.87-18.67 18.8-30.8 22.44-44.42.77-2.88 1.45-5.8 2.32-9.89l1.16-5.51c1.73-8.22 5.13-13.5 11.64-20 .63-.64 2.84-2.8 3.25-3.21 4.57-4.54 6.82-7.62 8.12-11.84a81.58 81.58 0 0 0 2.07-9.48l.81-4.57c1.62-8.9 3-13.8 5.24-16.89 3-4.15 7.2-3.78 12.71 1.74 3.8 3.8 5.42 7.58 5.2 11.66-.15 2.66-1.05 5.41-2.73 8.68a73.6 73.6 0 0 1-2.52 4.46l-2.84 4.63c-5.52 9.1-7.96 15.3-7.96 22.92 0 12.28-1.28 18.43-4.85 24.68-1.2 2.1-9.21 13.65-12.22 18.58-1.87 3.06-6.37 10.18-6.78 10.86-1.73 2.82-2.6 4.57-3.17 6.4-1.02 3.28-.98 2.1-.98 20.48 0 6.52-1.7 11.44-4.82 15zM310.09 0h1.06c-.37.9-.77 1.83-1.2 2.82-3.9 9.06-5.45 15.15-5.45 25.18 0 7.64-2.1 11.6-6.64 13.05-3.46 1.1-5.72.98-17.57-.43-11.55-1.36-19.17-1.58-28.16-.14-6.24 2.49-25.91 7.02-32.13 7.02-11.15 0-36.76-2.88-54.12-7.01a22.08 22.08 0 0 0-16.95 2.48c-4.05 2.33-7.09 5.03-13.9 11.97-6.28 6.39-9.53 9.23-13.8 11.5-7.09 3.79-11.22 7.65-13.4 12.27-1.82 3.85-2.33 7.84-2.33 15.29 0 4.4-2.65 6.69-9.45 9.74.1-.05-2.97 1.31-3.84 1.71-8.78 4.06-12.71 8.29-12.71 16.55 0 12.52-4.86 19.22-17.34 27.96l-4.56 3.14c-1.9 1.3-3.3 2.3-4.67 3.3-.92.68-1.79 1.34-2.62 2-7.16 5.62-11 14.54-15.56 33.28-.63 2.57-3.3 14-4.07 17.14a350.44 350.44 0 0 1-5.2 19.33c-1.37 4.5-4.5 15.07-4.96 16.53-1.05 3.4-1.64 4.94-2.46 6.32-.82 1.4-6.85 9.08-12.64 18.27L0 277.98v-1.9l4.58-7.35a270.8 270.8 0 0 1 12.61-18.23c-.3.5 1.35-2.8 2.38-6.12.45-1.44 3.58-12.01 4.95-16.53 1.83-6.03 3.44-12.09 5.19-19.27.76-3.13 3.44-14.56 4.06-17.14 4.62-18.95 8.52-28.02 15.92-33.83.84-.67 1.72-1.33 2.65-2.01 1.38-1.02 2.8-2.01 4.7-3.32l4.54-3.14C73.83 140.57 78.5 134.13 78.5 122c0-8.74 4.2-13.26 13.29-17.45.88-.41 3.96-1.77 3.85-1.73 6.46-2.9 8.86-4.97 8.86-8.82 0-7.6.53-11.7 2.42-15.71 2.29-4.84 6.57-8.85 13.84-12.73 4.15-2.21 7.35-5 14.15-11.93 6.28-6.4 9.36-9.13 13.52-11.53a23.07 23.07 0 0 1 17.69-2.59c17.27 4.12 42.8 6.99 53.88 6.99 6.1 0 25.73-4.53 31.92-7 9.12-1.46 16.83-1.25 28.49.13 11.63 1.38 13.9 1.5 17.15.47 4.06-1.3 5.94-4.85 5.94-12.1 0-10.1 1.56-16.3 6.6-28zm25.12 0h1c.05 5.62.26 11.48.65 19.4.47 9.7.64 14.57.64 21.6 0 9.81-4.68 17.46-13.1 23.16-6.53 4.43-14.94 7.46-24.33 9.33-3.74.54-9.42.56-22.68.23-6.74-.17-9.35-.22-12.39-.22-2.77 0-4.97.43-7.63 1.36-.88.3-4.55 1.74-5.58 2.11-6.55 2.35-13.59 3.53-24.79 3.53-8.1 0-13.58-1.38-22.46-4.9l-3.18-1.25c-12.55-4.87-21.27-5.15-37.18 1.12-11.15 4.39-18.13 9.2-22.28 14.81-3.15 4.26-4.33 7.8-5.94 15.8-1.22 6.09-1.93 8.74-3.5 12.13-1.65 3.53-3.97 5.81-7.07 7.22-2.33 1.07-4.35 1.5-9.32 2.19-9.04 1.27-12.77 3.09-15.61 9.58-3.71 8.48-7.72 13.87-14.22 19.76-2.4 2.18-13.14 11.02-15.91 13.42-8.2 7.1-13.85 17.37-18.7 31.97a258.81 258.81 0 0 0-3.27 10.7c-.01.05-2.26 7.97-2.88 10.1-8.49 28.85-17.88 52.95-26.13 61.2-2.8 2.8-5.06 5.64-10.4 12.96-3.4 4.68-6.23 8.25-8.95 11.1v-1.55c2.74-2.98 5.73-6.82 9.48-11.97 4.03-5.52 6.32-8.4 9.17-11.24 8.07-8.08 17.44-32.14 25.87-60.8.62-2.1 2.86-10.03 2.88-10.08 1.21-4.24 2.21-7.53 3.28-10.74 4.9-14.75 10.63-25.16 19-32.4 2.78-2.42 13.5-11.25 15.89-13.4 6.4-5.8 10.32-11.09 13.97-19.43 1.68-3.83 4.05-6.31 7.2-7.86 2.4-1.17 4.64-1.67 9.53-2.36 4.54-.63 6.5-1.05 8.7-2.06 2.89-1.31 5.03-3.42 6.58-6.73 1.53-3.3 2.23-5.9 3.43-11.9 1.64-8.14 2.85-11.79 6.11-16.2 4.28-5.79 11.41-10.7 22.73-15.16 16.15-6.36 25.13-6.07 37.9-1.11l3.19 1.26c8.77 3.47 14.13 4.82 22.09 4.82 11.09 0 18.02-1.16 24.46-3.47 1-.36 4.68-1.8 5.58-2.11A22.5 22.5 0 0 1 265 72.5c3.05 0 5.67.05 14.07.26 11.53.29 17.2.27 20.83-.25 9.25-1.85 17.54-4.83 23.94-9.17C332 57.8 336.5 50.46 336.5 41c0-7-.17-11.86-.7-22.7-.35-7.26-.55-12.83-.59-18.3zM93.87 0h2.04c-.7 4-1.61 6.82-3.03 9.47-2.33 4.38-2.85 5.75-5.26 13.03a40.46 40.46 0 0 1-1.94 5.03c-2.24 4.66-5.92 8.8-13.07 14.26-8.01 6.13-14.27 16.55-20.03 31.55-2.4 6.23-8.75 25.63-9.64 28.01-2.69 7.16-6.56 12.7-15.63 23.68l-2.68 3.24c-6.02 7.34-9.35 12.07-11.72 17.15-2.3 4.94-7.12 9.9-12.91 14.15v-2.4c5.14-3.94 9.1-8.3 11.1-12.6 2.46-5.27 5.87-10.1 11.98-17.56l2.68-3.26c8.94-10.8 12.72-16.22 15.3-23.1.88-2.33 7.24-21.74 9.65-28.03 5.89-15.31 12.3-26 20.68-32.41 6.92-5.3 10.4-9.2 12.48-13.55.65-1.35 1.16-2.7 1.85-4.79 2.45-7.4 3-8.83 5.4-13.34A27.68 27.68 0 0 0 93.87 0zm9.07 0h1.02c-1.66 8.3-2.91 12.67-4.54 15.26a59.14 59.14 0 0 0-4.1 8.21c-1.27 3-2.44 6.2-3.5 9.4-.38 1.12-.7 2.16-2.41 5.39a251.48 251.48 0 0 0-12.81 13.3c-3.48 3.96-5.95 7.27-7.15 9.66-.95 1.9-2.06 5.99-3.61 12.97-.64 2.9-3.65 17.15-4.51 21.07-3.63 16.45-6.63 26.69-9.9 32-7.66 12.45-10.64 15.71-37.08 41.1A69.78 69.78 0 0 1 0 179.21v-1.15a69.39 69.39 0 0 0 13.65-10.42c26.4-25.33 29.32-28.55 36.92-40.9 3.2-5.18 6.18-15.37 9.78-31.7.86-3.91 3.87-18.16 4.51-21.06 1.57-7.09 2.7-11.2 3.7-13.2 1.24-2.5 3.76-5.86 7.29-9.89.9-1.03 1.86-2.1 2.86-3.18 2.4-2.6 4.96-5.22 7.53-7.76.9-.88 1.73-1.7 3.37-3.4a129.02 129.02 0 0 1 4.78-13.46 60.07 60.07 0 0 1 4.19-8.35c1.52-2.44 2.74-6.71 4.36-14.74zM83.71 0h1.1c-2.09 4.74-6.03 8.92-11.42 12.3-7.2 4.52-16.5 7.2-24.39 7.2-8.9 0-11.8 7-11.74 21.52 0 1.7.04 3.17.12 5.99.1 3.3.12 4.45.12 5.99 0 5.73-.76 11.3-2.01 16.5a66.67 66.67 0 0 1-2.15 6.97 2597.76 2597.76 0 0 1-7 15.86A4270.8 4270.8 0 0 1 6.44 136.2 54.64 54.64 0 0 1 0 147v-1.65a54.87 54.87 0 0 0 5.55-9.57A4269.82 4269.82 0 0 0 30.7 79.97c.53-1.2.99-2.23 2.44-5.9A69.23 69.23 0 0 0 36.5 53c0-1.52-.03-2.66-.12-5.95-.08-2.83-.12-4.31-.12-6.01-.03-6.79.53-11.62 2.07-15.34 1.94-4.68 5.39-7.19 10.67-7.19 7.7 0 16.81-2.63 23.86-7.05C77.93 8.27 81.66 4.38 83.7 0zm282.63 0h1.01c1.86 10.02 2.18 12.67 2.32 18.3a123.43 123.43 0 0 1 .37 27.83c-.96 8.78-3.1 16.01-6.63 21.15-11.34 16.5-39.8 29.22-66.41 29.22-5.09 0-10.47.28-16.31.83a413.8 413.8 0 0 0-24.37 3.16c-21.56 3.26-27.66 4.01-36.32 4.01-6.92 0-12.2-1.05-21.69-3.9l-2.78-.83c-1.39-.41-2.54-.74-3.65-1.02-8-2.05-14.22-2.04-21.7.72a16.32 16.32 0 0 0-9.17 8.18c-1.6 3.05-2.5 6.06-4.02 12.83-1.5 6.64-2.34 9.52-3.99 12.64a16.16 16.16 0 0 1-9.85 8.36 104.8 104.8 0 0 0-9.5 3.42c-6.55 2.8-10.1 5.57-13.8 10.47-1.33 1.75-1.03 1.3-5.43 7.9-1.98 2.97-4.66 5.8-8.48 9.14-2.01 1.76-10.71 8.83-12.88 10.7-7.37 6.35-12.58 12.14-16.63 19.14-4.22 7.3-7.8 18.3-11.28 33.26-.87 3.73-1.72 7.64-2.64 12.14l-1.18 5.8-1.09 5.45c-1.8 8.96-2.77 13.28-3.77 16.26-6.8 20.44-17.26 42.16-27.13 51.2-5.11 4.7-8.1 7.07-11.1 8.86-.9.54-1.84 1.04-2.92 1.57-.44.22-9.6 4.4-14.1 6.66l-1.22.62v-1.13l.78-.39c4.52-2.26 13.67-6.44 14.1-6.65a41.19 41.19 0 0 0 2.84-1.54c2.94-1.75 5.88-4.09 10.94-8.73 9.71-8.9 20.1-30.51 26.87-50.79.97-2.92 1.94-7.22 3.73-16.13l1.1-5.46a490.5 490.5 0 0 1 3.82-17.96c3.5-15.06 7.1-26.14 11.39-33.54 4.11-7.11 9.4-12.98 16.83-19.4 2.19-1.88 10.88-8.95 12.88-10.7 3.77-3.28 6.39-6.05 8.3-8.93 4.43-6.64 4.12-6.18 5.47-7.96 3.8-5.03 7.5-7.91 14.21-10.78 2.61-1.12 5.74-2.24 9.59-3.46a15.17 15.17 0 0 0 9.27-7.86c1.59-3.02 2.42-5.85 4.03-12.99 1.41-6.27 2.32-9.33 3.98-12.48a17.31 17.31 0 0 1 9.7-8.66c7.7-2.83 14.1-2.84 22.3-.75 1.12.29 2.28.61 3.68 1.03l3.73 1.11c8.47 2.54 13.66 3.58 20.46 3.58 8.59 0 14.67-.75 36.18-4a414.64 414.64 0 0 1 24.41-3.17c5.88-.54 11.29-.83 16.41-.83 26.3 0 54.45-12.58 65.59-28.78 3.42-4.98 5.5-12.06 6.46-20.7.84-7.74.73-16.02.02-23.9a136.2 136.2 0 0 0-.57-5.12c0-4.47-.3-6.94-2.16-17zM18.88 0h1.03C18 7.57 17.15 10.18 14.46 16.2c-1.95 4.37-2.67 9.19-2.42 14.89.2 4.33.71 7.7 2.28 16.13 1.09 5.88 1.57 8.77 1.94 12.2.96 8.9.24 16.08-2.8 22.79A463.4 463.4 0 0 1 0 109.43v-2.12a465 465 0 0 0 12.54-25.52c2.97-6.52 3.67-13.53 2.72-22.27-.36-3.4-.84-6.26-1.93-12.12-1.57-8.47-2.1-11.88-2.29-16.27-.26-5.84.48-10.81 2.5-15.33 2.64-5.9 3.48-8.47 5.34-15.8zm280.47 0a70.78 70.78 0 0 1-4.91 11.24c-2.56 4.7-4.01 8.45-4.86 11.98l-.4 1.8-.28 1.45a5.28 5.28 0 0 1-.74 2.07c-.74 1.03-1.93 1.28-5.13 1.25.92 0-9.85-.29-15.03-.29-10.2 0-18.45.82-29.46 2.56-16.87 2.66-17.73 2.77-23.66 2.52a42.57 42.57 0 0 1-8-1.09c-17.7-4.16-46.18-5.86-54.72-3.01-2.72.9-5.88 2.8-9.52 5.59a112.37 112.37 0 0 0-6.54 5.48c-1.4 1.25-9.17 8.5-10.78 9.84-1.45 1.2-8.18 7.42-8.85 8.02a114.65 114.65 0 0 1-4.55 3.9c-4.99 4.03-8.9 6.2-11.92 6.2-3.52.05-4.32 0-5.14-.4-1.13-.56-1.5-1.72-1.13-3.57.74-3.63 4.47-10.84 12.84-24.8 5.69-9.48 9.42-18 11.78-26.2 1.45-5.04 1.94-7.4 2.97-14.54h1.01c-1.05 7.3-1.54 9.7-3.01 14.82-2.39 8.28-6.16 16.89-11.9 26.44-8.3 13.84-12 21.01-12.7 24.48-.3 1.45-.08 2.14.59 2.47.6.3 1.35.35 3.48.3 3.92 0 7.69-2.1 12.5-5.98 1.4-1.13 2.87-2.39 4.51-3.86.66-.59 7.41-6.83 8.88-8.05 1.59-1.33 9.34-8.55 10.75-9.82 2.4-2.15 4.55-3.96 6.6-5.53 3.72-2.85 6.97-4.8 9.81-5.74 8.76-2.92 37.41-1.22 55.27 2.99 2.57.6 5.14.95 7.81 1.06 5.84.25 6.7.14 23.47-2.51 11.05-1.75 19.36-2.57 29.6-2.57 5.2 0 15.99.3 15.05.29 2.87.03 3.84-.17 4.3-.83.23-.32.4-.8.58-1.7l.28-1.43.4-1.85c.88-3.6 2.36-7.44 4.96-12.22 1.87-3.43 3.44-7 4.73-10.76h1.06zm-8.59 0c-5.91 17.94-9.55 22-19.76 22-4.5 0-10.22.32-28.69 1.5l-1.53.1c-15.6.99-23.47 1.4-28.78 1.4-5.35 0-13.24-.96-28.86-3.28l-1.54-.23C163.18 18.75 157.47 18 153 18c-4.45 0-7.3 1.01-10.96 3.34-.1.06-1.8 1.17-2.3 1.47-2.43 1.5-4.32 2.19-6.74 2.19-2.8 0-4.11-1.46-4.11-4.22 0-1.04.16-2.29.5-4.1.16-.82.9-4.4 1.07-5.32.8-4.11 1.3-7.68 1.47-11.36h2c-.17 3.82-.68 7.5-1.5 11.75-.19.94-.92 4.5-1.07 5.31a21.04 21.04 0 0 0-.47 3.72c0 1.7.46 2.22 2.11 2.22 1.99 0 3.55-.57 5.7-1.9.47-.28 2.15-1.37 2.26-1.44C144.92 17.14 148.12 16 153 16c4.62 0 10.3.74 28.9 3.51l1.53.23C198.93 22.04 206.8 23 212 23c5.25 0 13.11-.41 28.65-1.4l1.54-.1C260.73 20.32 266.43 20 271 20c8.95 0 12.15-3.4 17.66-20h2.1zM141.51 0h1.13c-2.06 3.86-2.63 5.1-2.77 6.19-.15 1.12.42 1.64 2.32 1.96 1.8.3 3.85.35 10.81.35 6.02 0 13 .56 21.35 1.62 3.95.5 8.03 1.1 13.13 1.89 24 3.7 22.5 3.49 26.83 3.49 24.02 0 51.83-2.24 60.45-6.94 2.88-1.57 5.05-4.49 6.6-8.56h1.07c-1.64 4.47-3.98 7.69-7.2 9.44-8.83 4.82-36.67 7.06-60.92 7.06-4.41 0-2.84.22-26.98-3.5-5.1-.8-9.17-1.38-13.1-1.88-8.31-1.06-15.26-1.62-21.23-1.62-7.04 0-9.1-.05-10.97-.37-2.38-.4-3.38-1.32-3.15-3.07.16-1.22.69-2.41 2.63-6.06zm76.4 0c5.69 1.64 10.37 2.5 14.09 2.5 9.59 0 16.7-.71 22.4-2.5h2.98C251.12 2.53 243.2 3.5 232 3.5c-4.5 0-10.32-1.21-17.53-3.5h3.45zM70.69 0c-2.87 3.27-6.95 5.39-12.02 6.53-3.98.89-7.5 1.08-12.92 1A97.24 97.24 0 0 0 44 7.5c-5.37 0-8.86-1.24-10.1-4.97A8.6 8.6 0 0 1 33.5 0h.99c.02.82.14 1.56.36 2.22C35.91 5.39 39.02 6.5 44 6.5l1.76.02c5.35.09 8.8-.1 12.69-.97C62.95 4.54 66.63 2.74 69.3 0h1.37zM0 207.87c7.31-.16 11.5 3.33 11.5 11.13 0 11.41-5.05 28.35-11.5 41.5v-2.3c5.93-12.72 10.5-28.47 10.5-39.2 0-7.18-3.7-10.3-10.5-10.13v-1zm0 7.05c1.23.14 2.18.58 2.87 1.31 1.4 1.48 1.6 3.72 1.16 7.58l-.16 1.3A28.93 28.93 0 0 0 3.5 229c0 3.2-1.48 9.52-3.5 15.9v-3.45c1.49-5.13 2.5-9.87 2.5-12.45 0-.98.08-1.75.37-4.02l.16-1.29c.42-3.56.24-5.59-.88-6.77-.5-.53-1.21-.87-2.15-1v-1zM0 410.9v-1.47a21.67 21.67 0 0 0 2.97-4.7c1.32-2.7 2.68-6.28 4.56-11.89 7.85-23.55 7.83-26.6.25-30.4-2.25-1.12-4.8-1.43-7.78-.91v-1.02a13.1 13.1 0 0 1 8.22 1.04c8.24 4.12 8.26 7.6.25 31.6-1.88 5.66-3.25 9.27-4.6 12.02A20.82 20.82 0 0 1 0 410.9zM33.64 452c1.68 0 3.04-.23 8.34-1.31l2.38-.47c8.26-1.57 12.72-1.3 14.53 2.33 1.38 2.75-.47 5.86-4.75 9.68a75.6 75.6 0 0 1-5.08 4.07c-.94.7-4.89 3.59-5.79 4.27-1.86 1.4-2.97 2.37-3.47 3.03a19.08 19.08 0 0 0-2.89 5.5c.07-.2-4.02 13.65-6.96 22.22-2.7 7.85-5.56 10.72-8.82 8.59-2.11-1.4-3.66-4.24-6.6-11.03-1.98-4.62-2.5-5.76-3.4-7.4-4.55-8.18-3.9-23.9-.05-32.87a9.6 9.6 0 0 1 6.98-5.96c2.59-.66 4.86-.75 11.78-.67l3.8.02zm0 2c-1.13 0-2.09 0-3.82-.02-12.07-.13-14.83.57-16.9 5.41-3.63 8.47-4.26 23.55-.05 31.12.96 1.73 1.48 2.88 3.5 7.58 2.72 6.3 4.24 9.08 5.86 10.14 1.64 1.08 3.5-.8 5.82-7.55a682.9 682.9 0 0 0 6.97-22.24 21.03 21.03 0 0 1 3.18-6.04c.65-.87 1.85-1.9 3.86-3.43.92-.7 4.87-3.57 5.8-4.27 2.02-1.5 3.6-2.77 4.95-3.97 3.63-3.23 5.09-5.7 4.3-7.28-1.21-2.42-5.07-2.65-12.38-1.27l-2.35.47c-5.49 1.11-6.86 1.35-8.74 1.35zm345.63 146c-3.45-12.26-3.77-14.13-3.77-19 0-3.33-.13-6.27-.43-11.34-.63-10.33-.65-13.5.26-17.07 1.21-4.74 4.21-7.1 9.67-7.1h26c4.08 0 5.19 1.85 5.93 7.11.1.79.13.97.19 1.32.84 5.35 2.8 7.58 8.88 7.58 3.64 0 5.54.4 6.43 1.37.76.83.76 1.44.36 3.93-.85 5.26.5 8.85 7.5 13.8 6.32 4.45 11.63 5.36 16.55 3.37 3.8-1.54 6.73-4.16 11.92-10l1.1-1.23 1.09-1.23a75.6 75.6 0 0 1 2.7-2.86 35.81 35.81 0 0 1 9.57-6.73c1.52-.76 1.72-.86 5.66-2.63 6.1-2.73 9.01-4.5 11.74-7.62 2.63-3 4.67-4.85 6.7-6.04 3.18-1.85 5.46-2.13 13.68-2.13 5.98 0 10.56-4.32 18-14.99l2.82-4.03c1.06-1.5 1.94-2.7 2.79-3.79 7.87-10.12 19.38-10.4 30.74.96 5.54 5.53 10.17 19.43 13.64 38.51 2.5 13.75 4.18 29.46 4.47 39.84h-1c-.3-10.32-1.96-25.97-4.45-39.66-3.43-18.87-8.02-32.65-13.36-37.99-10.95-10.95-21.76-10.68-29.26-1.04-.83 1.07-1.7 2.26-2.75 3.75l-2.81 4.02c-7.65 10.95-12.38 15.42-18.83 15.42-8.04 0-10.21.26-13.17 2-1.92 1.12-3.9 2.9-6.45 5.83-2.86 3.26-5.87 5.09-12.09 7.88a103.35 103.35 0 0 0-5.62 2.6 34.84 34.84 0 0 0-9.32 6.54 74.67 74.67 0 0 0-3.75 4.05l-1.1 1.24c-5.28 5.95-8.29 8.64-12.28 10.25-5.26 2.13-10.92 1.17-17.5-3.48-7.33-5.17-8.82-9.15-7.92-14.77.34-2.12.34-2.6-.1-3.1-.64-.69-2.34-1.04-5.7-1.04-6.63 0-8.96-2.63-9.87-8.42l-.2-1.34c-.67-4.82-1.53-6.24-4.93-6.24h-26c-5 0-7.6 2.04-8.7 6.34-.88 3.43-.85 6.57-.23 16.76a177 177 0 0 1 .43 11.4c0 4.78.32 6.63 3.81 19h-1.04zm13.68 0c-1.31-6.58-1.61-10.71-1.36-14.84.04-.7.1-1.44.18-2.38l.23-2.56c.34-3.81.5-6.97.5-11.22 0-4.94 1.46-7.76 4.21-8.42 2.38-.58 5.56.54 9.2 3 6.64 4.52 13.99 13.07 16.55 19.23 4.77 11.44 14.12 15.69 33.54 15.69 8.6 0 14.32-2.35 20.67-7.88 1.45-1.26 15.06-15 21-20 7.21-6.07 11.77-7.59 20.62-8.32 5.52-.45 7.98-.9 11.44-2.36 4.58-1.95 9.36-5.48 14.9-11.29 7.43-7.76 13.25-8.92 17.47-4.3 3.32 3.63 5.46 10.58 6.82 20.24.73 5.17.94 7.74 1.58 17.38.25 3.75.17 5.32-.92 18.03h-1c1.09-12.7 1.17-14.28.92-17.97-.64-9.6-.85-12.16-1.57-17.3-1.33-9.47-3.43-16.27-6.56-19.7-3.76-4.11-8.93-3.08-16 4.32-5.65 5.9-10.54 9.5-15.25 11.5-3.58 1.53-6.13 1.99-11.6 2.44-8.8.72-13.17 2.18-20.2 8.1-5.9 4.96-19.5 18.7-21 19.99-6.52 5.68-12.47 8.12-21.32 8.12-19.78 0-29.5-4.42-34.46-16.3-2.49-5.97-9.71-14.38-16.2-18.79-3.42-2.32-6.36-3.35-8.4-2.86-2.2.53-3.44 2.92-3.44 7.45 0 4.28-.16 7.47-.5 11.31l-.23 2.56c-.09.93-.14 1.65-.19 2.35-.24 4.08.06 8.18 1.39 14.78h-1.02zm113.75 0c2.52-3.26 8.93-11.79 10.9-14.3 5.48-6.98 13.05-12.38 19.4-13.94 7.01-1.71 11.5 1.45 11.5 9.24 0 4.02-.04 5.16-.74 19h-1c.7-13.85.74-15 .74-19 0-7.12-3.86-9.83-10.26-8.26-6.11 1.5-13.5 6.77-18.85 13.57-1.86 2.36-7.65 10.07-10.43 13.69h-1.26zm-9.86-338.96c3.44 2.71 7 5.1 11.44 7.75 1.06.64 8.42 4.9 10.35 6.1 11.27 7 15 13.35 12.35 25.33-1.45 6.52-4.53 11.1-9.39 14.44-3.83 2.63-8.07 4.26-16.08 6.56-11.97 3.45-13.68 3.99-18.82 6.28a60.18 60.18 0 0 0-7.81 4.18c-11.11 7.07-19.1 7.7-27.96 3.28-3.56-1.77-17.2-11-17.2-11.01a101.77 101.77 0 0 0-5.2-3.07c-16.04-8.83-34.27-24.16-34.52-31.85-.11-3.46 1.99-6.57 6.28-10.26 1.03-.9 2.18-1.81 3.68-2.95.72-.55 3.38-2.56 3.94-3 4.47-3.4 7.18-5.79 9.32-8.45 11.12-13.82 26.55-28.68 34.36-32.28 12.06-5.54 19.84-5.77 27.37.12 3.25 2.54 5.65 6.54 8.58 13.35.29.65 2.3 5.45 2.88 6.74 1.62 3.65 2.9 5.8 4.24 6.94.72.6 1.45 1.2 2.2 1.8zm-3.49-.28c-1.63-1.39-3.03-3.74-4.77-7.65-.58-1.3-2.6-6.12-2.88-6.76-2.81-6.5-5.08-10.3-7.98-12.56-6.83-5.35-13.85-5.15-25.3.12-7.45 3.42-22.7 18.12-33.64 31.72-2.27 2.82-5.08 5.3-9.67 8.79l-3.94 2.98a79.98 79.98 0 0 0-3.59 2.88c-3.87 3.33-5.67 6-5.58 8.69.21 6.64 18.14 21.72 33.48 30.15 1.76.97 3.5 2 5.3 3.13.12.08 13.61 9.22 17.03 10.92 8.22 4.1 15.46 3.52 26-3.18a62.17 62.17 0 0 1 8.07-4.31c5.25-2.35 7-2.9 19.08-6.38 7.8-2.24 11.9-3.82 15.5-6.3 4.44-3.04 7.23-7.18 8.56-13.22 2.44-11.02-.83-16.6-11.45-23.2-1.9-1.18-9.23-5.42-10.32-6.08-4.5-2.69-8.13-5.12-11.64-7.9-.77-.6-1.52-1.21-2.26-1.84zM87.72 241.6c4.3-2.98 7.88-5 12.14-6.95.84-.4 1.73-.78 2.78-1.24l4.37-1.88a164.3 164.3 0 0 0 17.74-8.96 320.67 320.67 0 0 1 27.87-14.5c4.22-1.95 21.89-9.84 21.17-9.52 19.17-8.62 28.1-6.93 49.5 8.05 7.91 5.54 13.24 13.25 16.45 22.66 3.02 8.83 3.76 16.51 3.76 27.75 0 8.32-.66 12.95-3.68 18.97-4.18 8.36-12.3 16.14-25.58 23.47-24.45 13.49-38.83 27.55-52.83 47.84-8.83 12.8-47.76 44.21-65.16 54.15C75.04 413.55 48.89 423.5 31 423.5c-10.05 0-14.67-4.78-14.76-13.37-.07-6.32 2.06-13.73 6.3-24.32 2.95-7.37 2.02-12.9-2.16-22.29-3.19-7.17-3.88-9.14-3.88-12.52 0-3.35 1.87-6.9 5.52-11.07 2.61-3 3.5-3.83 11.9-11.5 5.09-4.66 8.08-7.6 10.7-10.75 9.46-11.36 12.62-19.47 17.9-44.78 3.12-15.05 6.63-20.28 15.12-25.25.8-.47 3.95-2.25 4.7-2.68a76.66 76.66 0 0 0 5.38-3.38zm.56.82a77.63 77.63 0 0 1-5.44 3.43l-4.7 2.67c-8.23 4.82-11.57 9.81-14.65 24.6-5.3 25.45-8.51 33.7-18.1 45.21-2.66 3.19-5.68 6.16-10.8 10.84-8.36 7.64-9.24 8.48-11.82 11.42-3.5 4.01-5.27 7.36-5.27 10.42 0 3.18.68 5.1 3.8 12.12 4.27 9.6 5.24 15.37 2.16 23.07-4.18 10.47-6.29 17.78-6.22 23.93.08 8.06 4.26 12.38 13.76 12.38 17.67 0 43.68-9.9 64.75-21.93 17.28-9.88 56.1-41.2 64.84-53.85 14.08-20.42 28.57-34.59 53.17-48.16 13.12-7.23 21.09-14.87 25.17-23.03 2.92-5.86 3.57-10.35 3.57-18.53 0-11.13-.74-18.73-3.7-27.43-3.15-9.22-8.36-16.75-16.09-22.16-21.13-14.8-29.7-16.42-48.5-7.95.7-.32-16.96 7.56-21.17 9.5-1.7.8-3.3 1.55-4.86 2.3a319.68 319.68 0 0 0-22.93 12.17 165.3 165.3 0 0 1-17.85 9.01l-4.37 1.88c-1.04.45-1.92.84-2.76 1.23a74.56 74.56 0 0 0-11.99 6.86zm-7.6 12.2c7.7-6.25 12.3-8.17 23.68-11.27 6.12-1.67 9.12-2.95 12.31-5.72 3.8-3.3 7.47-4.52 15.86-6.1 2.75-.52 3.67-.7 5.06-1.02 5.48-1.24 9.48-2.93 13.1-5.89 10.42-8.53 25.4-14.11 36.31-14.11 5.33 0 16.77 7.58 25.74 17.16 10.73 11.46 15.96 23.27 12.73 32.5-3.18 9.1-11.39 18.57-23.03 27.86-8.44 6.73-18.36 13-25.22 16.43-3.72 1.86-6.59 4.88-9.77 9.99-.69 1.1-11.1 20.25-16.03 27.83-5.62 8.65-15.4 17.36-30.23 27.96a552.58 552.58 0 0 1-9.2 6.42c-.13.09-6.81 4.65-8.6 5.89-6.47 4.46-10.35 7.35-13.05 9.83-11.64 10.67-37.14 15.54-43.7 8.98-1.96-1.96-2.2-4.06-1.95-10.52.37-9.42-.5-14.5-4.95-20.51a34.09 34.09 0 0 0-7.04-6.92c-3.93-2.95-6.07-6.11-6.56-9.49-.97-6.61 3.87-13.06 14.17-21.69 1.58-1.32 6.67-5.44 7.09-5.78a48.03 48.03 0 0 0 5.23-4.77c4.1-4.63 5.85-9.55 7.8-20.07a501.52 501.52 0 0 0 .8-4.37c.33-1.87.6-3.3.88-4.73.74-3.78 1.5-7.18 2.4-10.63 1-3.78 1.38-5.5 2.36-10.37.6-3.02.93-4.21 1.56-5.47 1.22-2.45 1.27-2.5 12.25-11.42zm.64.78c-10.77 8.74-10.88 8.84-12 11.08-.58 1.16-.88 2.3-1.47 5.22-.98 4.89-1.36 6.63-2.37 10.44-.9 3.43-1.65 6.8-2.39 10.56a339.79 339.79 0 0 0-1.29 6.95l-.39 2.15c-1.98 10.68-3.77 15.74-8.04 20.54a48.77 48.77 0 0 1-5.34 4.88c-.42.34-5.5 4.47-7.07 5.78-10.04 8.4-14.72 14.65-13.83 20.78.45 3.1 2.44 6.03 6.17 8.83 3 2.25 5.39 4.62 7.24 7.12 4.63 6.24 5.52 11.52 5.15 21.15-.25 6.14-.01 8.1 1.66 9.78 6.1 6.1 31.02 1.33 42.31-9.02 2.75-2.52 6.66-5.43 13.16-9.92l8.6-5.89c3.63-2.48 6.45-4.44 9.19-6.4 14.73-10.54 24.44-19.18 29.97-27.7 4.9-7.54 15.31-26.68 16.02-27.8 3.27-5.26 6.26-8.41 10.18-10.37 6.79-3.4 16.65-9.63 25.03-16.32 11.52-9.18 19.61-18.53 22.72-27.4 3.07-8.78-2.02-20.27-12.52-31.49-8.8-9.4-20.04-16.84-25.01-16.84-10.67 0-25.43 5.5-35.68 13.89-3.76 3.07-7.9 4.81-13.5 6.09-1.41.32-2.35.5-5.11 1.02-8.21 1.55-11.76 2.73-15.38 5.88-3.34 2.9-6.45 4.22-12.7 5.92-11.26 3.07-15.75 4.94-23.31 11.09zM212 251.85c0 7.56-.6 10.92-2.6 14.3-1.1 1.84-7.66 10.05-8.6 11.3-5.96 7.94-9.33 10.28-17.26 13.76-1.34.58-2.2 1-3.03 1.5-.55.33-1.2.66-2 1.02-.71.33-4.46 1.9-5.52 2.39-6.05 2.78-8.99 5.8-8.99 10.73 0 10.97-18.95 36.12-34.51 44.87-8.18 4.6-21.3 9.36-32.78 11.86-13.33 2.9-22.49 2.48-24.62-2.32-1.32-2.97-4.4-4.26-11.98-5.81l-.6-.12c-4.84-.99-6.94-1.55-9.03-2.64-2.92-1.5-4.48-3.7-4.48-6.84 0-2.74 1.08-5.77 3.25-9.67.85-1.53 1.82-3.13 3.23-5.35-.16.25 2.83-4.4 3.67-5.76 6.69-10.7 9.85-18.5 9.85-27.22 0-18.41 11.22-33.37 27.5-42.86 5.22-3.05 9.23-3.31 15.2-2.12 5.04 1 6.05.9 7.43-1.52 4.5-7.85 7.04-9.5 15.87-9.5 3.93 0 6.97-.98 10.47-3.16 1.56-.97 8.67-6.17 10.99-7.68 9.2-5.98 11.34-7 25.2-11.95 6.95-2.48 15.18 1.28 22.33 9.12 6.55 7.19 11.01 16.61 11.01 23.67zm-2 0c0-6.5-4.25-15.48-10.49-22.32-6.67-7.32-14.16-10.74-20.17-8.59-13.73 4.9-15.73 5.85-24.8 11.75-2.24 1.46-9.37 6.68-11.01 7.7-3.8 2.36-7.2 3.46-11.53 3.46-8.08 0-9.98 1.23-14.13 8.5-1.1 1.91-2.51 2.88-4.35 3.09-1.3.14-1.9.05-5.22-.61-5.53-1.1-9.07-.88-13.8 1.88-15.72 9.17-26.5 23.55-26.5 41.14 0 9.2-3.28 17.29-10.15 28.28l-3.68 5.77c-1.39 2.19-2.35 3.77-3.17 5.25-2.02 3.63-3 6.38-3 8.7 0 4.19 2.87 5.67 11.9 7.52l.61.12c8.27 1.7 11.7 3.13 13.4 6.95 3.17 7.14 36 0 54.6-10.46 14.98-8.43 33.49-32.99 33.49-43.13 0-5.9 3.47-9.48 10.16-12.55 1.1-.5 4.85-2.08 5.52-2.38.74-.34 1.32-.64 1.8-.93.92-.55 1.85-1 3.25-1.62 7.65-3.35 10.75-5.5 16.47-13.12 1.02-1.36 7.47-9.42 8.47-11.11 1.79-3.01 2.33-6.06 2.33-13.3zm-37.18-22.4c.15-.1 2.4-1.51 2.95-1.84.96-.57 1.7-.94 2.43-1.17 2.57-.83 5.06-.1 11.04 3.12 14.86 8 19.43 22.87 9.18 38.71-4.04 6.24-9.37 9-18.72 11.11-.85.2-1.2.27-3.13.68-6.04 1.29-8.78 2.08-11.6 3.65-3.63 2.02-6.09 4.98-7.5 9.44-7.87 24.93-19.72 43.34-36.28 50.31-16.45 6.93-21.13 8.53-27.98 8.89-4.94.25-9.8-.65-15.4-2.89a44.45 44.45 0 0 1-5.64-2.6c-4.02-2.33-5.14-4.74-4.5-9.31.3-2.13 3.77-15.53 4.84-20.65.63-3.05 1.19-6.14 1.75-9.69a464.04 464.04 0 0 0 1.35-8.9c1.42-9.41 2.5-14.27 4.49-18.65 2.46-5.43 6.13-9.03 11.72-11.13 6.59-2.47 10.54-3.1 18.03-3.53 4.75-.27 6.68-.64 9-2.05.61-.37 1.22-.81 1.82-1.33a30.61 30.61 0 0 0 3.37-3.4c.59-.69 2.38-2.9 2.63-3.19 3.36-4 6.3-5.53 12.33-5.53 3.94 0 5.9-.92 8.18-3.36-.17.18 2.75-3.14 3.85-4.22a30.95 30.95 0 0 1 6.79-5c1.5-.83 3.15-1.62 4.99-2.38a64.92 64.92 0 0 0 10.01-5.1zm-14.52 8.34a29.95 29.95 0 0 0-6.57 4.84 116.68 116.68 0 0 0-3.82 4.2c-2.46 2.63-4.68 3.67-8.91 3.67-5.72 0-8.39 1.39-11.57 5.17-.23.28-2.03 2.5-2.63 3.2a31.6 31.6 0 0 1-3.47 3.51c-.65.55-1.3 1.03-1.96 1.43-2.5 1.51-4.55 1.9-9.47 2.19-7.39.42-11.25 1.04-17.72 3.47-5.34 2-8.82 5.4-11.17 10.6-1.93 4.27-3 9.07-4.41 18.39l-.65 4.34-.7 4.57c-.57 3.56-1.12 6.67-1.76 9.73-1.08 5.18-4.54 18.53-4.83 20.59-.59 4.17.35 6.18 4.01 8.3 1.35.77 3.1 1.58 5.52 2.55 5.46 2.18 10.18 3.05 14.97 2.8 6.69-.34 11.32-1.93 27.65-8.8 16.21-6.83 27.92-25.01 35.71-49.7 1.49-4.7 4.12-7.86 7.97-10 2.93-1.63 5.74-2.45 11.87-3.76 1.92-.4 2.28-.49 3.12-.68 9.12-2.06 14.24-4.7 18.1-10.67 9.92-15.34 5.55-29.55-8.82-37.29-5.75-3.1-8.03-3.76-10.25-3.05-.65.2-1.33.54-2.23 1.08-.55.32-2.77 1.72-2.93 1.82a65.91 65.91 0 0 1-10.16 5.17c-1.8.75-3.42 1.52-4.89 2.33zm-42.39 32.72c16.15-2.87 26.36-.97 32.47 6.16 5.08 5.93 1.13 21.42-5.93 35.55-4.79 9.58-10.6 16.21-23.16 25.19-14.15 10.1-35.5 12.2-40.71 3.85-1.86-2.97-2.1-8.14-1.06-15.73.78-5.68 1.86-10.71 4.73-22.98l.12-.51c1.59-6.8 2.37-10.31 3.14-14.14 1.45-7.25 3.74-11.47 7.26-13.74 2.81-1.8 5.53-2.28 12.33-2.62 5.33-.27 7.56-.46 10.81-1.03zm.18.98c-3.3.59-5.56.78-10.94 1.05-6.62.33-9.23.78-11.84 2.46-3.25 2.1-5.42 6.09-6.82 13.1-.77 3.84-1.56 7.35-3.15 14.17l-.12.5c-2.86 12.24-3.93 17.26-4.7 22.9-1.03 7.36-.79 12.36.9 15.07 4.82 7.7 25.54 5.67 39.29-4.15 12.43-8.88 18.13-15.39 22.84-24.81 6.86-13.72 10.75-29 6.07-34.45-5.84-6.81-15.7-8.65-31.53-5.84zM132 276.5c7.12 0 10.66 3.08 11.25 8.7.42 4.02-.43 8.14-2.77 15.94-2.56 8.52-18.36 25.38-27.2 31.28-7.01 4.67-20.02 5.67-26.57.99-3.99-2.85-3.53-12.08.02-26.46.68-2.75 1.47-5.65 2.37-8.76a412.6 412.6 0 0 1 3.05-10.14l.37-1.2c1.48-4.8 5.1-7.75 10.73-9.27 4.4-1.2 9.54-1.5 17.48-1.33l3.89.1c3.87.11 5.42.15 7.38.15zm0 1c-1.97 0-3.53-.04-7.41-.15l-3.88-.1c-7.85-.17-12.92.13-17.2 1.3-5.32 1.43-8.67 4.16-10.03 8.6a1277.83 1277.83 0 0 1-1.6 5.21c-.68 2.2-1.27 4.17-1.82 6.1-.9 3.1-1.68 5.99-2.36 8.73-3.43 13.88-3.87 22.93-.4 25.4 6.17 4.42 18.73 3.45 25.42-1 8.66-5.78 24.33-22.49 26.8-30.73 2.3-7.67 3.14-11.71 2.73-15.56-.53-5.1-3.64-7.8-10.25-7.8zm-17.79 7a31.3 31.3 0 0 1 8.57 1.4c5.42 1.78 8.72 5.03 8.72 10.1 0 9.59-9.51 17.2-22.34 21.47-9.82 3.28-13.62-1.79-11.66-16.54.84-6.28 3.82-10.67 8.24-13.46a20.38 20.38 0 0 1 8.47-2.97zm-.6 1.08a19.39 19.39 0 0 0-7.34 2.73c-4.18 2.64-6.98 6.78-7.77 12.76-1.89 14.11 1.36 18.45 10.34 15.46C121.3 312.37 130.5 305 130.5 296c0-4.56-2.98-7.5-8.03-9.15a28.05 28.05 0 0 0-8.2-1.35c-.13 0-.35.03-.66.08zm80.87-23.45c-2.72 9.8-14.93 9.86-26.72 3.3-10.17-5.64-13.8-17.98-5-22.87a66.53 66.53 0 0 0 4.48-2.7l2.03-1.3a50.15 50.15 0 0 1 3.92-2.3c4.73-2.43 8.82-2.8 14-.72 9.16 3.66 10.98 13.33 7.3 26.6zm-20.83-24.98a49.26 49.26 0 0 0-3.84 2.25l-2.03 1.3c-.84.53-1.5.95-2.16 1.35-.82.5-1.6.96-2.38 1.39-7.94 4.4-4.59 15.8 5 21.12 11.31 6.29 22.8 6.23 25.28-2.7 3.57-12.83 1.85-21.97-6.7-25.4-4.9-1.95-8.69-1.62-13.17.7zm17.85 12.15c0 5.7-2.44 9-6.64 9.96-3.3.76-7.56-.05-11.08-1.81l-1.89-.94c-.67-.34-1.18-.62-1.63-.88-4.07-2.38-4.13-4.97.34-10.93 6.8-9.06 20.9-7.16 20.9 4.6zm-1 0c0-5.3-2.87-8.55-7.32-9.16-4.23-.57-8.99 1.44-11.78 5.16-4.15 5.54-4.1 7.44-.64 9.47.44.25.93.51 1.59.85l1.87.93c3.34 1.67 7.36 2.44 10.42 1.74 3.73-.86 5.86-3.74 5.86-9zM387 530.3c0-12.8 2.44-16.74 18.48-29.77a56.8 56.8 0 0 1 7.61-5.2c2.6-1.5 5.33-2.82 8.5-4.18 1.24-.53 2.48-1.05 4.1-1.7l3.92-1.57c9.4-3.83 13.74-6.7 16.62-12.05 1.2-2.22 2.21-4.4 3.23-6.83a148.57 148.57 0 0 0 1.54-3.84l.3-.74.56-1.44c3.2-8.02 6.05-12.08 12.7-16.5a35.26 35.26 0 0 0 4.96-4 46.36 46.36 0 0 0 3.88-4.29c.27-.34 2.55-3.2 3.2-3.98 3.48-4.15 6.51-5.9 11.51-5.9 3.08 0 5.62-.63 9.57-2.1 5.42-2.02 6.53-2.34 8.96-2.2 2.53.13 4.85 1.26 7.18 3.59 1.3 1.3 5.55 5.83 6.52 6.78 5.06 5 9.44 6.92 17.77 6.92a197.5 197.5 0 0 1 12.08.45c15.93.87 21.94.57 25.28-2.21 6.91-5.77 11.64-2.73 11.64 7.76 0 10.73-8.6 20-19 20-4.8 0-8.32 1.43-9.34 3.67-1.12 2.48.68 6.15 5.98 10.57 13.6 11.33 11.24 20.76-7.64 20.76a21.91 21.91 0 0 0-14.6 5.24c-3.28 2.71-5.8 5.86-9.85 11.82l-1.52 2.25c-3.1 4.57-5.01 7.1-7.32 9.4-6.21 6.21-9.3 7.64-13.05 6.89l-1-.23a10.82 10.82 0 0 0-2.66-.37c-1.6 0-2.41.67-8.18 6.22-4.85 4.67-8.07 6.78-11.82 6.78-1.33 0-3.46 1.15-6.45 3.45-1.27.98-2.68 2.14-4.5 3.7l-4.92 4.29a181.11 181.11 0 0 1-4.54 3.82c-9.33 7.56-15.63 10.2-20.21 6.52-2.7-2.15-4.14-4.51-4.63-7.26-.37-2.04-.26-3.63.29-7.3.87-5.85.65-8.42-1.83-11.6-2.32-2.98-2.96-3.22-3.77-2.39-.25.26-1.35 1.63-1.61 1.94-2.21 2.5-4.85 3.57-9 2.82-4.6-.84-5.57-4.11-4.72-10.09l.24-1.56c.6-3.66.68-4.93.25-5.8-.44-.86-1.9-.94-5.23.4l-.74.29c-13.78 5.54-15.26 6.09-19.43 6.67-6.03.84-9.31-1.6-9.31-7.9zm2 0c0 5 2.14 6.6 7.04 5.92 3.91-.55 5.43-1.1 18.95-6.55l.75-.3c4.17-1.66 6.7-1.54 7.76.58.71 1.43.62 2.76-.06 7l-.24 1.53c-.72 5.04-.06 7.27 3.09 7.84 3.43.62 5.38-.17 7.15-2.18.2-.23 1.34-1.66 1.68-2 1.9-1.96 3.82-1.25 6.78 2.55 2.9 3.74 3.17 6.77 2.22 13.12-1 6.75-.52 9.4 3.62 12.71 3.49 2.8 9.1.45 17.7-6.51 1.35-1.1 2.75-2.28 4.49-3.78l4.93-4.3c1.84-1.58 3.27-2.76 4.58-3.77 3.34-2.56 5.74-3.86 7.67-3.86 3.04 0 5.95-1.9 10.43-6.22l2.46-2.39c.94-.89 1.67-1.56 2.37-2.13 1.81-1.49 3.3-2.26 4.74-2.26 1.03 0 1.81.13 3.1.42.7.16.71.17.96.21 2.96.6 5.45-.55 11.23-6.33 2.2-2.2 4.06-4.65 7.09-9.11l1.52-2.25c4.15-6.11 6.76-9.37 10.22-12.24a23.9 23.9 0 0 1 15.88-5.7c16.87 0 18.62-7.01 6.36-17.23-5.9-4.92-8.12-9.41-6.52-12.93 1.42-3.12 5.67-4.84 11.16-4.84 9.25 0 17-8.34 17-18 0-8.94-2.88-10.79-8.36-6.23-3.94 3.28-9.98 3.59-26.67 2.68l-1.02-.06c-5.09-.27-7.99-.39-10.95-.39-8.88 0-13.76-2.14-19.18-7.5-1-.98-5.26-5.53-6.53-6.79-1.99-1.99-3.86-2.9-5.87-3-2.03-.12-3.06.18-8.15 2.07-4.15 1.55-6.9 2.22-10.27 2.22-4.33 0-6.84 1.46-9.98 5.2-.63.74-2.89 3.6-3.18 3.95a48.29 48.29 0 0 1-4.04 4.46 37.26 37.26 0 0 1-5.24 4.23c-6.26 4.17-8.9 7.91-11.95 15.58l-.57 1.43-.28.74a531.5 531.5 0 0 1-1.56 3.88 77.49 77.49 0 0 1-3.32 7c-3.16 5.88-7.82 8.97-17.63 12.96l-3.92 1.58c-1.6.64-2.84 1.15-4.05 1.67a79.2 79.2 0 0 0-8.3 4.08 54.8 54.8 0 0 0-7.35 5.02C391.12 514.78 389 518.21 389 530.31zm133.22-79.76c3.06 1.53 6.54 2.02 10.68 1.7 2.53-.2 4.91-.62 8.8-1.49 5.36-1.19 6.33-1.38 8.33-1.54 2.78-.23 4.82.17 6.29 1.4 1.58 1.31 1.96 2.72 1.26 4.22-.66 1.38-1.05 1.74-5.05 5.07-3.53 2.93-5.03 4.83-5.03 7.09 0 7.3 1.29 10.02 7.83 15.62 3.86 3.3 5.93 6.84 5.28 9.62-.75 3.25-4.96 5.02-12.61 5.02-7.18 0-12.7 4.61-20.03 14.68-.5.7-3.96 5.57-4.94 6.87a38.89 38.89 0 0 1-4.72 5.5c-1.06.98-2.09 1.7-3.1 2.15-2.85 1.26-5.05 1.57-9.83 1.74-7.66.27-10.87 1.45-14.98 7.1-1.58 2.17-3.11 4-4.68 5.6a42.87 42.87 0 0 1-8.65 6.69c-.15.08-10.69 6.19-14.8 8.83-3.76 2.42-6.45 2.04-8.22-.77-1.28-2.03-1.9-4.54-2.87-10.35-.84-5.08-1.27-7.08-2.06-8.93-.97-2.3-2.21-3.24-4.02-2.88-6.2 1.24-8.95 1.39-10.98.2-2.37-1.4-3.13-4.62-2.62-10.73.16-1.96-1.04-2.87-3.76-3.04-2.24-.13-4.9.2-9.94 1.12l-.69.12c-7.97 1.45-10.72 1.72-12.72.73-2.91-1.43-1.6-5.27 4.23-12.21 5.48-6.53 10.6-10.81 15.76-13.53 3.74-1.97 5.94-2.65 12.16-4.1 7.29-1.72 10.4-3.51 14.04-9.31 2.96-4.75 10.74-18.62 12.14-20.84 3.59-5.67 6.8-9.1 11.05-11.34 2.6-1.38 4.72-2.82 9.17-6.07l1.38-1.01c7.85-5.72 12.3-7.98 17.68-7.98 4.22 0 6.49 1.36 9.13 4.77.34.43 1.67 2.22 2 2.67.85 1.09 1.6 1.98 2.45 2.83a24.29 24.29 0 0 0 6.64 4.78zm-.44.9c-2.8-1.4-5-3.03-6.92-4.97-.87-.9-1.65-1.81-2.51-2.93-.35-.46-1.68-2.25-2.01-2.67-2.47-3.18-4.46-4.38-8.34-4.38-5.09 0-9.4 2.2-17.09 7.78l-1.38 1.01c-4.49 3.29-6.63 4.74-9.3 6.15-4.06 2.15-7.16 5.45-10.66 11-1.39 2.19-9.16 16.05-12.15 20.82-3.79 6.07-7.13 7.98-14.66 9.75-6.13 1.45-8.27 2.1-11.92 4.02-5.04 2.66-10.05 6.86-15.46 13.3-5.43 6.46-6.53 9.69-4.55 10.66 1.7.84 4.48.57 12.1-.81l.7-.13c5.12-.93 7.82-1.27 10.17-1.12 3.21.2 4.92 1.48 4.7 4.11-.48 5.76.2 8.64 2.13 9.78 1.73 1.02 4.34.88 10.27-.31 2.35-.47 4 .78 5.14 3.47.83 1.95 1.27 4 2.07 8.8l.06.36c.94 5.65 1.55 8.11 2.72 9.98 1.46 2.3 3.52 2.6 6.84.46 4.14-2.66 14.69-8.77 14.81-8.85a41.9 41.9 0 0 0 8.46-6.54 47.89 47.89 0 0 0 4.6-5.48c4.32-5.95 7.81-7.23 15.74-7.5 4.66-.17 6.76-.47 9.46-1.67.9-.4 1.85-1.06 2.84-1.96a38.03 38.03 0 0 0 4.6-5.36c.96-1.3 4.4-6.16 4.93-6.87 7.5-10.31 13.22-15.09 20.83-15.09 7.24 0 11.02-1.6 11.64-4.24.54-2.32-1.36-5.55-4.97-8.64-6.75-5.79-8.17-8.79-8.17-16.38 0-2.67 1.64-4.74 5.39-7.86 3.8-3.17 4.23-3.56 4.78-4.73.5-1.06.25-1.99-.99-3.03-2.23-1.85-4.72-1.65-13.76.36-3.93.87-6.35 1.3-8.94 1.5-4.3.34-7.97-.18-11.2-1.8zm-28-3.9c5.65-2.82 8.96-2.2 12.9 1.37.56.5 2.6 2.47 3.02 2.87 4.2 3.89 8.07 5.71 14.3 5.71 11.37 0 14 1.41 16.1 8.09.26.83 1.35 4.6 1.66 5.62.8 2.63 1.64 5.03 2.7 7.6 2.13 5.17 2.64 8.32 1.72 10.24-.77 1.61-2.1 2.18-5.37 2.79-2.32.43-2.8.53-3.85.85-1.85.58-3.35 1.4-4.6 2.66-1 1-2.02 2.13-3.31 3.66-.6.71-2.91 3.5-3.46 4.14-7.2 8.54-12.43 12.35-19.59 12.35-3.76 0-6.95 1.28-10.59 4-1.84 1.37-11.62 10.31-15.22 13.06a73.09 73.09 0 0 1-8.95 5.88c-4.58 2.54-7.35 3.22-8.98 2.23-1.32-.8-1.65-2.07-1.94-5.5a52.53 52.53 0 0 0-.16-1.81c-.54-4.73-2.24-6.86-7.16-6.86-7.11 0-8.85-1.23-9.73-5.41-.96-4.61-2.1-6.7-6.55-9.67-3.97-2.65-4.31-5.42-1.52-8.22 2-2 4.63-3.5 11.35-6.87 6.61-3.3 9.2-4.8 11.1-6.68a39.09 39.09 0 0 0 5.3-6.48c.98-1.5 1.83-3.04 2.88-5.13l2.12-4.3c.91-1.83 1.72-3.37 2.61-4.98 5.74-10.32 10.37-14.78 23.22-21.2zm-22.34 21.7c-.89 1.59-1.69 3.12-2.6 4.94l-2.11 4.3a52.9 52.9 0 0 1-2.94 5.23 40.08 40.08 0 0 1-5.44 6.63c-2 2-4.62 3.51-11.35 6.87-6.6 3.3-9.2 4.8-11.1 6.69-2.33 2.34-2.08 4.37 1.38 6.67 4.7 3.14 5.96 5.46 6.97 10.3.78 3.7 2.09 4.62 8.75 4.62 5.5 0 7.57 2.57 8.15 7.75.06.5.09.82.17 1.84.25 3.06.55 4.17 1.46 4.72 1.2.74 3.69.13 7.98-2.25a72.09 72.09 0 0 0 8.82-5.8c3.55-2.7 13.34-11.65 15.24-13.07 3.79-2.83 7.18-4.19 11.18-4.19 6.77 0 11.8-3.67 18.83-12l3.45-4.13a60.07 60.07 0 0 1 3.37-3.72 11.72 11.72 0 0 1 5.01-2.91c1.1-.34 1.6-.45 3.97-.89 2.95-.55 4.07-1.02 4.65-2.23.76-1.59.28-4.5-1.74-9.43a84.46 84.46 0 0 1-2.74-7.69c-.31-1.03-1.4-4.8-1.66-5.61-1.95-6.2-4.16-7.39-15.14-7.39-6.5 0-10.61-1.93-14.98-5.98-.44-.4-2.46-2.37-3.01-2.86-3.65-3.3-6.52-3.85-11.79-1.21-12.67 6.33-17.15 10.65-22.78 20.8zm55.86 11.93c-2.98 6.45-16.78 15.26-26.74 15.26-5.33 0-7.56-2.98-7.11-7.86.32-3.48 2.1-7.91 3.93-10.61l1.52-2.32a44.95 44.95 0 0 1 1.88-2.7c3.66-4.8 7.85-7.45 13.62-7.45 9.06 0 15.75 9.52 12.9 15.68zm-.9-.42c2.52-5.47-3.65-14.26-12-14.26-5.4 0-9.33 2.48-12.82 7.06-.6.8-1.17 1.6-1.85 2.64 0 0-1.2 1.87-1.52 2.33-1.74 2.57-3.46 6.85-3.77 10.14-.4 4.33 1.43 6.77 6.12 6.77 9.57 0 23.02-8.58 25.83-14.68zm-69.67 20.74c2.08.18 4.44.81 5.88 1.8 2.12 1.47 2.2 3.6-.26 6.05-5.14 5.15-12.85 4.34-12.85-1.35 0-4.66 3.14-6.84 7.23-6.5zm-.09 1c-3.56-.3-6.14 1.5-6.14 5.5 0 4.58 6.53 5.26 11.15.65 2.03-2.04 1.98-3.43.4-4.52-1.27-.88-3.48-1.47-5.4-1.63zm29.59-225.95c4.64 2.35 17.27 8.24 19.39 9.43a24.14 24.14 0 0 1 7.05 5.64 45.03 45.03 0 0 1 3.75 5.2c2.4 3.78.04 7.66-6.2 11.63-4.97 3.16-12.18 6.3-21.95 9.82-4.84 1.74-19.63 6.68-21.1 7.2-6.59 2.33-14.85.1-25.14-5.86-3.93-2.27-8-5-12.94-8.54-2.23-1.61-9.5-6.99-10.7-7.85a81.21 81.21 0 0 0-8.63-5.7c-4.82-2.6-4.45-6.64.17-12.13 3.27-3.88 4.17-4.67 18.1-16.33a230.2 230.2 0 0 0 8.89-7.74 95.2 95.2 0 0 0 4.72-4.66c5.08-5.43 9.8-6.49 14.97-3.92 2.24 1.1 4.53 2.85 7.43 5.52 1.48 1.37 6.94 6.72 7.98 7.7 5.2 4.91 9.46 8.2 14.2 10.6zm-.46.9c-4.85-2.45-9.18-5.79-14.44-10.76-1.05-1-6.5-6.34-7.97-7.69-2.83-2.61-5.06-4.3-7.2-5.37-4.75-2.36-9-1.4-13.8 3.71a96.18 96.18 0 0 1-4.76 4.71c-2.48 2.3-5.16 4.62-8.92 7.77-13.86 11.6-14.77 12.4-17.98 16.21-4.28 5.08-4.58 8.4-.46 10.61 2.23 1.2 4.9 2.99 8.74 5.77 1.2.87 8.47 6.24 10.7 7.85a154.8 154.8 0 0 0 12.85 8.49c10.06 5.82 18.07 7.98 24.3 5.78 1.48-.52 16.27-5.47 21.1-7.2 9.7-3.5 16.86-6.61 21.75-9.72 5.84-3.71 7.9-7.1 5.9-10.26a44.09 44.09 0 0 0-3.67-5.08 23.16 23.16 0 0 0-6.78-5.42c-2.08-1.16-14.68-7.05-19.36-9.4zm-38.83 8.05c3.11-.37 5.7-.13 8.4.7 2.15.66 2.74.93 8.64 3.77 4.75 2.29 8.39 3.86 13.19 5.56 8.38 2.97 11.32 6.23 8.83 9.76-2.08 2.94-8.04 5.92-17.84 9.18-8.45 2.82-15.48 2.35-21.43-.9-4.65-2.55-8.33-6.5-12.15-12.3-2.9-4.41-2.73-8.2.16-11.06 2.48-2.45 6.87-4.07 12.2-4.7zm.12 1c-5.13.6-9.33 2.16-11.62 4.42-2.53 2.5-2.68 5.77-.02 9.8 3.73 5.68 7.3 9.51 11.8 11.97 5.7 3.11 12.43 3.57 20.62.84 9.59-3.2 15.44-6.12 17.34-8.82 1.94-2.75-.5-5.45-8.35-8.24-4.84-1.72-8.5-3.3-13.28-5.6-5.84-2.81-6.42-3.07-8.5-3.71a18.42 18.42 0 0 0-8-.66zM202.5 500.38c0 4.78-1.45 7.56-4.43 8.93-2.29 1.05-4.55 1.23-10.79 1.2l-1.78-.01c-9.19 0-17-7.65-17-15.5 0-7.59 10.6-10.51 19.74-5.44 2.78 1.55 4.21 1.94 8.57 2.75 4.44.83 5.69 2.27 5.69 8.07zm-1 0c0-5.3-.9-6.34-4.88-7.08-4.45-.83-5.96-1.25-8.86-2.86-8.57-4.76-18.26-2.1-18.26 4.56 0 7.3 7.36 14.5 16 14.5h1.79c6.06.04 8.26-.14 10.36-1.1 2.6-1.2 3.85-3.6 3.85-8.02zm33.33-117.85c3.71-1.31 8.7-2.7 16.1-4.55 2.58-.65 16.53-4.04 20.56-5.05 19.59-4.93 31.55-8.9 38.23-13.35 14.93-9.95 36.87-33.88 43.83-47.8 2.25-4.5 4.65-6.38 7.68-6.25 1.26.06 2.61.45 4.32 1.2a50.81 50.81 0 0 1 3.54 1.7l1.26.63c4.78 2.34 8.38 3.44 12.65 3.44 7.2 0 10.01 3.07 8.35 7.91-1.4 4.06-5.92 8.91-11.1 12.02-8.3 4.98-11.75 17.3-11.75 33.57 0 3.59-1.37 6.28-3.98 8.36-1.98 1.58-4.2 2.6-8.47 4.16l-1.02.37c-4.85 1.75-6.98 2.77-8.68 4.46-5.09 5.1-12.54 7.15-20.35 7.15-1.38 0-2.47.92-3.99 3.1-.29.41-1.32 1.95-1.47 2.18-2.68 3.92-4.93 5.72-8.54 5.72-7.84 0-10.74.93-21.76 6.94-5.18 2.82-8.8 3.58-14.66 3.68-.26 0-.47 0-.92.02-4.82.06-7.12.3-10.51 1.34a73.43 73.43 0 0 0-8.89 3.56c-2.17 1-10.53 5.01-10.23 4.87-7.79 3.7-13.32 5.98-18.9 7.57-12.41 3.55-18.58 2.24-27.42-4.07-2.58-1.85-2.72-4.43-.83-7.62 1.45-2.45 3.9-5.09 8.08-8.97l1.78-1.64c3.92-3.6 4.48-4.11 5.9-5.53 2.32-2.32 3.12-3.5 5.48-7.63 1.93-3.36 3.37-5.11 6.27-7.06 2.3-1.54 5.34-2.98 9.44-4.43zm.34.94c-4.03 1.42-7 2.83-9.22 4.32-2.75 1.85-4.1 3.49-5.96 6.73-2.4 4.2-3.24 5.44-5.64 7.83-1.43 1.44-2 1.96-5.94 5.57l-1.77 1.63c-4.1 3.82-6.52 6.41-7.9 8.75-1.65 2.79-1.54 4.8.55 6.3 8.6 6.14 14.46 7.38 26.57 3.92 5.5-1.57 11-3.84 18.74-7.51-.3.14 8.06-3.88 10.24-4.88a74.3 74.3 0 0 1 9.01-3.6c3.51-1.09 5.89-1.33 10.8-1.4h.91c5.72-.1 9.18-.83 14.2-3.57 11.16-6.08 14.2-7.06 22.24-7.06 3.19 0 5.2-1.6 7.71-5.28l1.48-2.2c1.7-2.43 3-3.52 4.81-3.52 7.57 0 14.78-2 19.65-6.85 1.83-1.84 4.04-2.9 9.04-4.7l1.02-.37c8.6-3.13 11.79-5.67 11.79-11.58 0-16.6 3.53-29.2 12.24-34.43 5-3 9.35-7.67 10.66-11.48 1.42-4.13-.83-6.59-7.4-6.59-4.45 0-8.19-1.14-13.09-3.54-7.52-3.67-6.78-3.34-8.72-3.43-2.58-.1-4.65 1.52-6.74 5.7-7.04 14.07-29.1 38.14-44.17 48.19-6.81 4.54-18.84 8.52-38.55 13.48-4.03 1.02-17.98 4.4-20.56 5.05-7.37 1.84-12.33 3.23-16 4.52zM252 387.5c2.08 0 4-.2 7.25-.69 5.22-.77 6.64-.9 8.46-.5 2.52.56 3.79 2.35 3.79 5.69 0 4.05-2.27 7.29-6.62 10.11-3.24 2.1-6.53 3.53-14.15 6.4l-.27.1-2.28.86c-3.04 1.16-5.27 2.52-9.33 5.43l-.8.57c-8.19 5.88-13.35 8.03-23.05 8.03-4.98 0-6.88-2.03-5.75-5.62.87-2.81 3.58-6.56 7.8-11.13 1.26-1.37 2.64-2.8 4.15-4.3 3.17-3.14 11.25-10.61 11.45-10.8.46-.47.93-.89 1.4-1.26 3.38-2.71 5.77-3.08 14.18-2.93 1.65.03 2.63.04 3.77.04zm0 1c-1.15 0-2.13-.01-3.79-.04-8.18-.14-10.4.2-13.54 2.71-.44.35-.88.74-1.32 1.18-.2.21-8.3 7.69-11.45 10.82a134.6 134.6 0 0 0-4.12 4.26c-4.12 4.47-6.76 8.12-7.58 10.75-.9 2.88.45 4.32 4.8 4.32 9.46 0 14.44-2.07 22.46-7.84l.8-.57c4.13-2.96 6.42-4.36 9.56-5.56l2.3-.86.25-.1c7.55-2.84 10.8-4.25 13.97-6.3 4.08-2.65 6.16-5.6 6.16-9.27 0-2.89-.97-4.26-3-4.7-1.65-.37-3.05-.25-8.1.5-3.3.5-5.26.7-7.4.7zm112.47-45.34c-1.88 5.44-1.98 6.76-.98 12.76 1.18 7.06-1.38 16.58-5.49 16.58a16.89 16.89 0 0 0-1.51.07l-.64.04c-2.86.18-4.83.17-6.94-.17-6.55-1.06-10.41-5.14-10.41-13.44 0-13.9 2.14-19.69 8.13-26.33a21.9 21.9 0 0 0 2.52-3.75c.59-1.03 2.78-5.13 2.72-5.01 4.44-8.14 7.71-11.53 12.25-10.4 1.17.3 2.2.77 3.58 1.59l1.39.84a20 20 0 0 0 3.1 1.6c.7.27 1.8.32 4.75.26l.72-.01c3.16-.05 4.78.08 5.83.66 1.61.89 1.2 2.56-1.14 4.9a215.9 215.9 0 0 1-3.86 3.76c-10.6 10.1-12.75 12.4-14.02 16.05zm-.94-.32c1.34-3.9 3.46-6.17 14.27-16.46 1.55-1.47 2.73-2.62 3.85-3.73 1.94-1.95 2.17-2.88 1.35-3.33-.82-.45-2.37-.58-5.32-.53l-.72.01c-3.14.06-4.26.02-5.14-.34-1.06-.41-1.97-.9-3.25-1.67l-1.38-.83a12.1 12.1 0 0 0-3.31-1.47c-3.88-.97-6.92 2.17-11.13 9.9.07-.13-2.14 3.98-2.73 5.02a22.71 22.71 0 0 1-2.65 3.92c-5.81 6.47-7.87 12-7.87 25.67 0 7.79 3.48 11.47 9.57 12.45 2.01.33 3.92.34 6.71.16a371.33 371.33 0 0 0 1.23-.07c.42-.03.73-.04.99-.04 3.2 0 5.6-8.9 4.5-15.42-1.02-6.16-.91-7.64 1.03-13.24zm-9.26 12.42c.58.52 2.5 1.9 2.55 1.93 1.96 1.57 2.04 3.31.01 6.36-3.74 5.64-8.83 3.09-8.83-4.55 0-3.81.51-5.67 2.07-6.02 1.18-.26 2 .3 4.2 2.28zm-1.34 1.48c-1.5-1.35-2.23-1.85-2.43-1.8-.17.03-.5 1.23-.5 4.06 0 5.87 2.67 7.21 5.17 3.45 1.5-2.26 1.47-2.84.4-3.7.03.03-1.95-1.4-2.64-2zm222.9-130.19c2.2-1.1 3.67-1.66 5.88-2.36l.28-.09a48.92 48.92 0 0 0 8.79-3.55c4.17-2.08 6.35-1.88 6.96.84.44 2 .2 4.01-1.25 12.7-2.27 13.62-9.16 26.14-21.17 36.3-4.3 3.63-7.41 4.39-9.75 2.44-1.88-1.57-3.1-4.57-4.61-10.48-.3-1.15-1.43-5.83-1.72-6.96a114.18 114.18 0 0 0-2.71-9.22c-2.4-6.82-3.03-10.78-2.1-12.94.77-1.83 2.08-2.24 5.6-2.45 1.49-.09 2.09-.14 2.97-.28l1.95-.33c.72-.12 1.22-.2 1.68-.29 1.1-.2 1.92-.38 2.71-.6 1.7-.49 3.42-1.2 6.49-2.73zm.44.9c-3.11 1.54-4.88 2.29-6.65 2.79-.84.23-1.69.42-2.81.63a108.77 108.77 0 0 1-3.81.63c-.77.13-1.39.19-2.92.28-3.13.18-4.17.51-4.74 1.85-.78 1.84-.2 5.62 2.13 12.2a115.12 115.12 0 0 1 2.74 9.31l1.72 6.96c1.46 5.7 2.62 8.58 4.28 9.96 1.87 1.56 4.49.93 8.47-2.44 11.82-10 18.6-22.3 20.83-35.7 1.4-8.45 1.65-10.51 1.25-12.31-.41-1.87-1.86-2-5.54-.16a49.87 49.87 0 0 1-8.93 3.6l-.28.1a35.4 35.4 0 0 0-5.74 2.3zm-4.5 6.58c1.37-.32 2.5-.75 3.9-1.42.35-.18 2.57-1.31 3.32-1.67 1.5-.71 2.97-1.31 4.7-1.89 2.7-.9 4.64-.77 5.88.4.98.94 1.34 2.26 1.41 4.18.02.4.02.7.02 1.37 0 5.63-4.63 16.88-11.34 22.75-4.34 3.8-7.31 4.67-9.92 2.52-2.06-1.7-3.5-4.65-6.67-12.91-1.86-4.83-2.05-8.1-.68-10.2 1.12-1.7 2.9-2.36 5.83-2.7l1.26-.12c1.19-.12 1.75-.19 2.3-.31zm-2.1 2.3l-1.22.12c-2.4.27-3.7.76-4.39 1.81-.93 1.43-.78 4.1.87 8.38 3.02 7.84 4.41 10.71 6.08 12.09 1.63 1.34 3.64.75 7.33-2.48C584.6 250.77 589 240.08 589 235c0-.64 0-.93-.02-1.29-.05-1.44-.3-2.33-.79-2.8-.6-.57-1.8-.65-3.87.04a37.95 37.95 0 0 0-4.47 1.8c-.72.34-2.93 1.47-3.32 1.66a19.54 19.54 0 0 1-4.3 1.56c-.66.16-1.28.24-2.56.36zm-227.73-88.98c-1.59 4.3-3.54 7.25-7.14 11.4l-2.6 2.97a67.02 67.02 0 0 0-2.63 3.23 46.4 46.4 0 0 0-4.68 7.5c-2.85 5.7-7.14 10.18-12.85 13.89-4.25 2.76-8.25 4.62-15.67 7.59-11.01 4.4-16.43 1.26-27.22-16.4-2.86-4.69-8.8-8.63-17.98-12.66-3-1.33-12.88-5.24-14.43-5.92-4.96-2.18-7.04-3.72-6.42-5.85.67-2.32 5.3-4.05 15.48-6.08 16.63-3.32 26.93-3.82 39.93-3.02 7.9.49 9.67.5 12.74-.26 1.99-.48 3.92-1.3 6-2.6l2.79-1.71c9.86-6.14 12.94-7.96 17.3-9.9 6.03-2.71 10.57-3.32 13.94-1.4 7.2 4.12 7.68 7.7 3.44 19.22zm-1.88-.7c3.95-10.7 3.6-13.26-2.56-16.78-2.66-1.52-6.62-.99-12.12 1.48-4.24 1.9-7.3 3.7-17.07 9.77l-2.79 1.73a22.6 22.6 0 0 1-6.57 2.84c-3.36.81-5.22.8-13.34.3-12.84-.78-22.97-.29-39.41 3-4.9.97-8.45 1.88-10.79 2.75-2.03.76-3.04 1.45-3.17 1.91-.16.57 1.48 1.79 5.3 3.46 1.5.67 11.39 4.58 14.44 5.93 9.52 4.19 15.74 8.3 18.87 13.44 10.35 16.93 14.87 19.56 24.78 15.6 7.3-2.93 11.21-4.75 15.33-7.42 5.42-3.53 9.47-7.75 12.15-13.1 1.44-2.9 3.02-5.4 4.86-7.82a68.95 68.95 0 0 1 2.72-3.33l2.6-2.97c3.46-3.99 5.28-6.75 6.77-10.79zm-6.64-.39c-7.94 12.8-18.53 21.75-33.3 25.23-7.82 1.83-12.47-.79-13.12-5.93-.55-4.45 2.29-9.06 6-9.06 3.02 0 5.6-1.68 15.38-9.16 1.47-1.12 2.57-1.96 3.66-2.74 4.4-3.2 7.77-5.17 10.82-6.08 5.57-1.67 9.33-2.15 11.35-1.22 2.5 1.14 2.22 4.13-.79 8.96zm-.84-.52c2.72-4.4 2.94-6.74 1.21-7.53-1.71-.79-5.32-.33-10.65 1.27-2.9.87-6.2 2.79-10.51 5.92-1.08.79-2.18 1.62-3.65 2.74-10.08 7.72-12.62 9.36-15.98 9.36-3.02 0-5.5 4.02-5 7.94.56 4.5 4.62 6.78 11.89 5.07 14.48-3.4 24.86-12.18 32.69-24.77zM461.17 33.53c13.88 4.96 20.75 4.96 31.62.01 3.02-1.37 5.47-2.94 11-6.82 5.57-3.92 8.05-5.51 11.14-6.92 4.14-1.88 7.78-2.38 11.22-1.28 3.92 1.26 6.2 12.3 6.78 28.45.5 14.2-.52 28.93-2.46 34.2-1.82 4.93-5.86 8.17-11.51 10.02A41.7 41.7 0 0 1 506 93.01c-5.79 0-9 2.4-12.2 7.64-.37.59-1.55 2.6-1.71 2.87-1.75 2.9-3.05 4.33-4.93 4.95-.94.32-2.07.83-3.87 1.74l-2.43 1.23c-1.03.53-1.87.94-2.7 1.34-6.43 3.1-11.73 4.72-17.16 4.72-5.71 0-10.04 2.09-14.02 5.92-1.16 1.11-4.2 4.53-4.63 4.94-2.54 2.44-5.93 4.24-10.85 6.1-1.4.52-5.98 2.13-6.25 2.22l-2.06.78c-.89.36-1.78.63-2.7.81-5.55 1.14-11.14-.54-17.98-4.42-1.27-.73-5.13-3.06-5.76-3.42-2.05-1.16-4.12-1.53-9.09-1.9l-1.73-.15c-4.78-.4-7.68-1.14-10.22-2.97-5-3.61-6.77-7.76-5.65-12.33 1.33-5.42 6.5-11.02 14.85-17.28a169.2 169.2 0 0 1 6.5-4.61c-.33.23 4.33-2.92 5.3-3.6 2.73-1.91 4.8-3.9 12.75-12.04l1.09-1.1c3.49-3.56 5.89-5.89 8.12-7.83 2.9-2.5 4.72-5.95 7.5-13.05l.63-1.61c2.7-6.92 4.28-10 6.87-12.33 1.42-1.28 6.68-6.54 7.93-7.5 3.98-3 8.01-2.73 19.57 1.4zm-.34.94c-11.26-4.02-15-4.28-18.62-1.53-1.19.9-6.4 6.11-7.88 7.43-2.42 2.18-3.96 5.19-6.6 11.95l-.63 1.61c-2.83 7.26-4.72 10.8-7.77 13.45a141.85 141.85 0 0 0-9.16 8.87c-8.02 8.2-10.08 10.2-12.88 12.16-.99.69-5.65 3.84-5.31 3.6-2.5 1.71-4.52 3.13-6.47 4.59-8.17 6.13-13.23 11.6-14.48 16.72-1.02 4.15.58 7.9 5.26 11.27 2.36 1.7 5.11 2.4 9.72 2.8l1.73.13c5.12.4 7.28.78 9.5 2.05.65.36 4.5 2.7 5.76 3.4 6.66 3.78 12.04 5.4 17.29 4.32.86-.17 1.7-.42 2.52-.75a67 67 0 0 1 2.1-.8c.28-.1 4.86-1.7 6.24-2.22 4.8-1.8 8.08-3.56 10.5-5.88.4-.38 3.44-3.8 4.63-4.94 4.16-4 8.72-6.2 14.72-6.2 5.25 0 10.42-1.59 16.73-4.62.82-.4 1.65-.8 2.68-1.33.12-.06 1.93-.99 2.43-1.23 1.84-.93 3-1.46 4-1.8 1.6-.52 2.76-1.82 4.39-4.52l1.7-2.88c3.39-5.5 6.87-8.11 13.07-8.11 4.45 0 8.73-.49 12.64-1.77 5.4-1.76 9.2-4.8 10.9-9.41 1.87-5.11 2.9-19.75 2.39-33.83-.56-15.53-2.81-26.48-6.08-27.52-3.18-1.02-6.57-.55-10.5 1.23-3.02 1.37-5.47 2.94-11 6.83-5.57 3.92-8.05 5.5-11.14 6.92-11.13 5.05-18.26 5.05-32.38.01zM475 55c5.38 0 7.55-.21 9.72-.96 1.26-.43 9.95-4.8 14.88-6.96 1.9-.82 3.56-2.44 6.6-6.04 2.56-3.04 3.19-3.75 4.4-4.84 3.7-3.35 7.07-3.28 10.22 1.23 6.23 8.9 5.61 15.94.07 27.02a71.26 71.26 0 0 0-2.5 5.48c-.32.8-1 2.7-1.09 2.9-.17.45-.34.81-.54 1.17-.63 1.14-1.56 2.21-4.05 4.7-2.4 2.4-5.16 3.27-11.68 4.33-1.81.3-2.2.36-3 .51-6.02 1.1-9.6 2.69-12.24 6.07-3.57 4.59-7.9 7.48-14.98 10.74-.55.24-1.1.5-1.8.8l-1.78.8a60.08 60.08 0 0 0-7.7 3.9c-2.57 1.6-4.79 2.35-9.42 3.46-8.58 2.06-12.28 3.76-17.37 9.36-5.12 5.64-10.17 7.64-16.63 6.7-5.36-.79-10.63-3.01-23.56-9.48-6.3-3.15-6.43-7.78-1.5-13.56 3.38-3.94 3.52-4.06 19.4-16.44 8.12-6.33 12.97-10.57 16.63-14.88 2.53-2.98 4.2-5.73 4.96-8.3 5.5-18.3 12.5-21.98 22.78-15.56 1.95 1.22 6.61 4.55 7.18 4.9 3.36 2.15 6.52 2.95 13 2.95zm0 2c-6.84 0-10.37-.89-14.08-3.26-.63-.4-5.27-3.71-7.16-4.9-9.05-5.65-14.66-2.7-19.8 14.45-.86 2.87-2.67 5.85-5.35 9.01-3.78 4.45-8.7 8.75-16.94 15.17-15.66 12.21-15.86 12.38-19.1 16.16-4.17 4.9-4.09 8 .88 10.48 12.71 6.35 17.89 8.54 22.94 9.28 5.78.84 10.18-.9 14.87-6.06 5.42-5.96 9.45-7.82 18.38-9.96 4.43-1.07 6.5-1.76 8.83-3.22a61.7 61.7 0 0 1 7.94-4.02l1.78-.8 1.78-.8c6.82-3.13 10.91-5.87 14.24-10.14 3-3.87 7-5.64 13.46-6.82.83-.15 1.21-.21 3.04-.51 6.1-1 8.6-1.78 10.58-3.77 2.36-2.36 3.21-3.34 3.72-4.26.15-.27.29-.56.44-.94.06-.15.75-2.06 1.09-2.9.64-1.6 1.45-3.4 2.57-5.64 5.24-10.49 5.8-16.8.07-24.98-2.4-3.44-4.37-3.48-7.24-.89-1.11 1-1.73 1.7-4.22 4.65-3.24 3.85-5.04 5.59-7.32 6.59-4.82 2.1-13.62 6.53-15.03 7.01-2.44.84-4.79 1.07-10.37 1.07zm-12.7 8.6c5.47 3.9 10.34 3.72 18.23.88 5.39-1.94 5.92-2.1 7.7-2.1 2.5-.01 4.21 1.36 5.24 4.46 1.66 4.98-2.32 8.52-12.3 12.68-2.7 1.13-16.25 6.18-20 7.73-7.86 3.24-13.93 6.42-18.87 10.15-13.02 9.84-18.36 11.93-23.71 9.68a24.67 24.67 0 0 1-3.62-1.98l-1.99-1.28a90.4 90.4 0 0 0-2.24-1.4c-3.33-2-2.82-4.28.85-7.34 1.35-1.13 10.66-7.61 13.53-9.91 7.1-5.69 11.91-11.47 14.41-18.34 3.07-8.45 4.89-12.1 6.8-13.39 1.73-1.16 3.36-.53 6.18 1.9.63.56 3.4 3.08 4.11 3.7 1.93 1.7 3.71 3.15 5.67 4.55zm-.6.8c-1.98-1.42-3.79-2.88-5.74-4.6-.73-.64-3.48-3.16-4.1-3.7-2.5-2.16-3.75-2.65-4.97-1.83-1.66 1.11-3.44 4.7-6.42 12.9-2.57 7.07-7.5 12.99-14.72 18.78-2.91 2.33-12.21 8.8-13.52 9.9-3.22 2.68-3.56 4.17-.97 5.72l2.26 1.4 1.99 1.28c1.47.93 2.48 1.5 3.47 1.91 4.9 2.07 9.96.07 22.72-9.56 5.02-3.79 11.15-7 19.1-10.28 3.76-1.55 17.3-6.6 20-7.72 9.5-3.97 13.14-7.2 11.73-11.44-.9-2.71-2.25-3.8-4.3-3.79-1.6 0-2.15.17-7.36 2.05-8.17 2.94-13.34 3.14-19.16-1.01z'%3E%3C/path%3E%3C/svg%3E"); +} diff --git a/frontend/src/components/main-page/ui/counter/Counter.js b/frontend/src/components/main-page/ui/counter/Counter.js new file mode 100644 index 00000000..85573c97 --- /dev/null +++ b/frontend/src/components/main-page/ui/counter/Counter.js @@ -0,0 +1,19 @@ +import React, { useContext } from "react"; +import { CounterContext } from "./CounterContext"; + +export default function Counter() { + const { count, increment, decrement, setCountValue } = + useContext(CounterContext); + + return ( +
+ + + +
+ ); +} diff --git a/frontend/src/components/main-page/ui/counter/CounterContext.js b/frontend/src/components/main-page/ui/counter/CounterContext.js new file mode 100644 index 00000000..07a9b4f5 --- /dev/null +++ b/frontend/src/components/main-page/ui/counter/CounterContext.js @@ -0,0 +1,58 @@ +import React, { createContext } from "react"; + +export const CounterContext = createContext(); + +export const Context = (props) => { + const [count, setCount] = React.useState("1"); + const maxLength = 10; // Максимальная длина числа (например, 10 цифр) + + function setCountValue(e) { + const value = e.target.value; + + // Проверка, если введенное значение больше, чем количество доступных мест + if (parseInt(value) > props.free_beds) { + setCount(props.free_beds.toString()); // Обновляем значение до свободных мест + return; + } + + // Если строка состоит только из нулей, устанавливаем значение как "0" + if (/^0+$/.test(value)) { + setCount("0"); + return; + } + + // Ограничиваем количество цифр + if (value === "" || /^[0-9]*$/.test(value)) { + if (value.length <= maxLength) { + setCount(value); // Обновляем состояние только если длина значения не превышает maxLength + } + } + } + + function increment() { + setCount((prevCount) => { + const newCount = Math.min(parseInt(prevCount) + 1, props.free_beds); // Ограничение максимальным числом + return newCount.toString(); + }); + } + + function decrement() { + setCount((prevCount) => { + const newCount = Math.max(parseInt(prevCount) - 1, 0); + return newCount.toString(); + }); + } + + const value = { + count, + increment, + decrement, + setCountValue, + }; + + return ( + + {props.children} + + ); +}; diff --git a/frontend/src/components/main-page/ui/login-btn/LoginBtn.js b/frontend/src/components/main-page/ui/login-btn/LoginBtn.js index 466b591f..91b267d7 100644 --- a/frontend/src/components/main-page/ui/login-btn/LoginBtn.js +++ b/frontend/src/components/main-page/ui/login-btn/LoginBtn.js @@ -1,19 +1,22 @@ -import React from 'react' -import { Routes, Route, Link } from 'react-router-dom'; -import AuthForm from '../../../auth/login/auth'; +import React from "react"; +import { Routes, Route, Link } from "react-router-dom"; +import AuthForm from "../../../auth/login/auth"; export default function LoginBtn() { - return ( - <> - -
- user-icon -

Sing In

-
- - - } /> - - - - ) + return ( + <> + +
+ user-icon +

Войти

+
+ + + } /> + + + ); } diff --git a/frontend/src/components/main-page/ui/register-btn/RegisterBtn.js b/frontend/src/components/main-page/ui/register-btn/RegisterBtn.js index beb34dce..358c97f0 100644 --- a/frontend/src/components/main-page/ui/register-btn/RegisterBtn.js +++ b/frontend/src/components/main-page/ui/register-btn/RegisterBtn.js @@ -1,19 +1,22 @@ -import React from 'react' -import { Routes, Route, Link } from 'react-router-dom'; -import RegisterForm from '../../../auth/register/RegisterForm'; +import React from "react"; +import { Routes, Route, Link } from "react-router-dom"; +import RegisterForm from "../../../auth/register/RegisterForm"; export default function RegisterBtn() { - return ( - <> - -
-

Sing Up

- user-icon -
- - - } /> - - - - ) + return ( + <> + +
+

Регистрация

+ user-icon +
+ + + } /> + + + ); } diff --git a/frontend/src/index.js b/frontend/src/index.js index 4c0350b3..42857d5e 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,12 +1,16 @@ -import React from 'react'; -import ReactDOM from 'react-dom/client'; -import './index.css'; -import App from './App'; -import {BrowserRouter} from 'react-router-dom'; +import React from "react"; +import ReactDOM from "react-dom/client"; +import "./index.css"; +import App from "./App"; +import {BrowserRouter} from "react-router-dom"; +import {BasketProvider} from "./components/context/BasketContext"; +import {NotificationProvider} from "./components/context/NotificationContext"; -const root = ReactDOM.createRoot(document.getElementById('root')); -root.render( - - - -); +const root = ReactDOM.createRoot(document.getElementById("root")); +root.render( + + + + + +); diff --git a/frontend/tests/auth.test.js b/frontend/tests/auth.test.js new file mode 100644 index 00000000..f0128e53 --- /dev/null +++ b/frontend/tests/auth.test.js @@ -0,0 +1,72 @@ +const { Builder, By, until, Capabilities } = require("selenium-webdriver"); +const chrome = require("selenium-webdriver/chrome"); +const assert = require("assert"); + +describe("Test axios with refresh token", function () { + let driver; + + + this.timeout(1500000); + + beforeEach(async () => { + const options = new chrome.Options(); + options.addArguments("disable-web-security"); + options.addArguments("user-data-dir=/tmp/chrome-profile"); + + driver = await new Builder() + .forBrowser("chrome") + .setChromeOptions(options) + .build(); + }); + + afterEach(async () => { + await driver.quit(); + }); + + it("should refresh token and make the request", async () => { + // Мокируем данные в localStorage (перед каждым тестом) + await driver.executeScript(() => { + localStorage.setItem("accessToken", "initial-access-token"); + localStorage.setItem("refreshToken", "initial-refresh-token"); + }); + + + await driver.get("http://127.0.0.1:3000"); + + // Обработка всех всплывающих окон (alert) + try { + await driver.wait(until.alertIsPresent(), 10000); // Ждем появления alert + let alert = await driver.switchTo().alert(); // Переключаемся на alert + await alert.accept(); // Закрываем alert + console.log("Alert closed successfully."); + } catch (e) { + console.log("No alert found, continuing with the test."); + } + + // Время ожидания для загрузки страницы + await driver.wait(until.titleIs("Your Page Title"), 90000); + + // Ожидания активации кнопки + const button = await driver.wait( + until.elementLocated(By.id("some-button")), + 90000 + ); + await driver.wait(until.elementIsVisible(button), 90000); // Проверка видимости кнопки + + // Нажимаем на кнопку, которая вызывает axios запрос + await button.click(); + + // Ждем, пока результат обновится и элемент с ID "result" станет доступным + await driver.wait(until.elementLocated(By.id("result")), 10000); + + // Проверяем, что данные отображаются корректно после обновления токенов + const result = await driver.findElement(By.id("result")).getText(); + assert.strictEqual(result, "Success"); + + // Проверяем, что в запросе используется новый токен + const token = await driver.executeScript(() => { + return localStorage.getItem("accessToken"); + }); + assert.strictEqual(token, "new-access-token"); + }); +}); diff --git a/nginx/Dockerfile b/nginx/Dockerfile index d4a1a394..b04d34ed 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,8 +1,41 @@ +# Build stage +FROM nginx:1.27-alpine-slim AS builder + +# Install build dependencies and compile module in single layer +RUN apk add --no-cache \ + curl \ + gcc \ + libc-dev \ + make \ + openssl-dev \ + pcre-dev \ + zlib-dev \ + linux-headers \ + wget \ + git \ + && cd /tmp \ + && wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz \ + && tar zxf nginx-${NGINX_VERSION}.tar.gz \ + && git clone https://github.com/openresty/headers-more-nginx-module.git \ + && cd nginx-${NGINX_VERSION} \ + && ./configure \ + --with-compat \ + --add-dynamic-module=../headers-more-nginx-module \ + && make modules \ + && mkdir -p /modules \ + && cp objs/ngx_http_headers_more_filter_module.so /modules/ + +# Runtime stage FROM nginx:1.27-alpine-slim -# Install curl for healthcheck -RUN apk add --no-cache curl +# Copy only the compiled module +COPY --from=builder /modules/ngx_http_headers_more_filter_module.so /etc/nginx/modules/ -COPY ./nginx.conf /etc/nginx/conf.d/default.conf +# Copy configuration +COPY ./nginx.conf /etc/nginx/nginx.conf +COPY ./default.conf /etc/nginx/conf.d/default.conf + +# Install only runtime dependencies +RUN apk add --no-cache curl -HEALTHCHECK --interval=1m30s --timeout=10s --start-period=40s --retries=3 CMD curl -so /dev/null http://localhost/ || exit 1 +HEALTHCHECK --interval=1m30s --timeout=10s --start-period=40s --retries=3 CMD curl -so /dev/null http://localhost/ || exit 1 \ No newline at end of file diff --git a/nginx/default.conf b/nginx/default.conf new file mode 100644 index 00000000..a8c90a55 --- /dev/null +++ b/nginx/default.conf @@ -0,0 +1,174 @@ +upstream client { + server frontend; + server django; + server redis-commander; + server rabbitmq; +} + +server { + # Remove server information headers + server_tokens off; + + more_clear_headers Server; + more_clear_headers X-Powered-By; + more_clear_headers X-Runtime; + more_clear_headers X-Version; + more_clear_headers X-AspNet-Version; + more_clear_headers X-AspNetMvc-Version; + + # Add security headers + add_header X-Content-Type-Options "nosniff" always; + add_header X-Frame-Options "SAMEORIGIN"; + # add_header X-Frame-Options "DENY" always; + add_header X-XSS-Protection "1; mode=block" always; + add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; + add_header Referrer-Policy "strict-origin-when-cross-origin" always; + + proxy_hide_header X-Powered-By; + proxy_hide_header Server; + proxy_hide_header X-Runtime; + proxy_hide_header X-Version; + proxy_hide_header Content-Security-Policy; + + proxy_connect_timeout 600; + proxy_send_timeout 600; + proxy_read_timeout 600; + send_timeout 600; + + # Add Content Security Policy headers + add_header Content-Security-Policy " + default-src 'self'; + script-src 'self' 'unsafe-inline' 'unsafe-eval' + https://cdn.jsdelivr.net; + style-src 'self' 'unsafe-inline' + https://cdn.jsdelivr.net + https://fonts.googleapis.com; + img-src 'self' data: + https://cdn.jsdelivr.net + https://avatars.mds.yandex.net; + font-src 'self' data: + https://fonts.gstatic.com; + connect-src 'self' + ws://localhost:3000/ws + wss://localhost:3000/ws + ws://localhost:3000/socket + wss://localhost:3000/socket + http://127.0.0.1:8000 + https://127.0.0.1:8000; + frame-ancestors 'none'; + base-uri 'self'; + form-action 'self'; + object-src 'none'; + media-src 'self'; + " always; + + # Block access to metadata + location ~ ^/latest/meta-data/ { + deny all; + return 404; + } + + # Block direct access to AWS metadata IP + location ~ ^/169\.254\.169\.254 { + deny all; + return 404; + } + + listen 80; + + location / { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://frontend:3000/; + } + + location /api/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://django:8000/api/; + } + + location /log/login/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://django:8000/log/login/; + } + + location /admin/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://django:8000/admin/; + } + + location /accounts/profile/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://django:8000/accounts/profile/; + } + + location /static-dj/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://django:8000/static-dj/; + } + + location /redis-commander/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://redis-commander:8081/; + } + + location /rabbitmq/ { + # Add security headers + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + + # Prevent proxy redirects to metadata + proxy_redirect off; + + proxy_pass http://rabbitmq:15672/; + } +} \ No newline at end of file diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 482a1fc1..40c04fb4 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -1,34 +1,13 @@ -upstream client { - server frontend; - server django; - server redis-commander; - server rabbitmq; -} - -server { - listen 80; - - location / { - proxy_pass http://frontend:3000/; - } - - location /api/swagger/ { - proxy_pass http://django:8000/swagger/; - } +user nginx; +worker_processes auto; +load_module /etc/nginx/modules/ngx_http_headers_more_filter_module.so; - location /api/ { - proxy_pass http://django:8000/api/; - } - - location /static-dj/ { - proxy_pass http://django:8000/static-dj/; - } - - location /redis-commander/ { - proxy_pass http://redis-commander:8081/; - } +events { + worker_connections 1024; +} - location /rabbitmq/ { - proxy_pass http://rabbitmq:15672/; - } +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + include /etc/nginx/conf.d/*.conf; } \ No newline at end of file