Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/release #116

Merged
merged 2 commits into from
Feb 3, 2024
Merged

fix/release #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b3ba5a
feat: bump yarn bundle, fix lint errors
Nelfimov Feb 3, 2024
c21b82e
chore: trigger release
Nelfimov Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file renamed ...inux-x64-musl-npm-12.1.0-ba7473df3f-9.zip → ...-darwin-arm64-npm-12.1.0-773b5e10e1-9.zip
View file
Open in desktop
Binary file not shown.
Binary file removed .yarn/cache/@next-swc-linux-x64-gnu-npm-12.1.0-9ea5ce91a7-9.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/fsevents-patch-19706e7e35-9.zip
View file
Open in desktop
Binary file not shown.
1,752 changes: 784 additions & 968 deletions .yarn/releases/yarn-file.cjs → .yarn/releases/yarn-remote.cjs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ packageExtensions:
dependencies:
react: '*'

yarnPath: .yarn/releases/yarn-file.cjs
yarnPath: .yarn/releases/yarn-remote.cjs
2 changes: 1 addition & 1 deletion landing/app/src/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const Bare = ({ Component, pageProps, props }) => {
return (
<ApolloProvider client={client}>
<ThemeProvider>
<Component {...props} {...pageProps} />
<Component {...pageProps} {...props} />
</ThemeProvider>
</ApolloProvider>
)
Expand Down
3 changes: 2 additions & 1 deletion landing/app/src/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "preserve"
"jsx": "preserve",
"incremental": true
},
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
"exclude": ["node_modules"]
Expand Down
37 changes: 20 additions & 17 deletions landing/fragments/landing-navigation/src/navigation.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,23 +104,26 @@ const Navigation: FC = () => {
</Layout>
<Layout flexGrow={1} flexBasis={[0, 0, 168]} flexShrink={0} />
<Row alignItems='center' justifyContent='flex-start' display={['none', 'none', 'flex']}>
{navigation[language]?.filter(item => !relocationId.includes(item.id)).reverse().map(({ title, elementsMenu, content }) => (
<>
<Layout>
<Condition match={elementsMenu?.externalLink !== null}>
<Link href={elementsMenu.externalLink} fontSize='semiRegular'>
{title}
</Link>
</Condition>
<Condition match={elementsMenu?.externalLink === null}>
<NextLink path={content} fontSize='semiRegular'>
{title}
</NextLink>
</Condition>
</Layout>
<Layout flexBasis={40} />
</>
))}
{navigation[language]
?.filter((item) => !relocationId.includes(item.id))
.reverse()
.map(({ title, elementsMenu, content }) => (
<>
<Layout>
<Condition match={elementsMenu?.externalLink !== null}>
<Link href={elementsMenu.externalLink} fontSize='semiRegular'>
{title}
</Link>
</Condition>
<Condition match={elementsMenu?.externalLink === null}>
<NextLink path={content} fontSize='semiRegular'>
{title}
</NextLink>
</Condition>
</Layout>
<Layout flexBasis={40} />
</>
))}
<Layout flexBasis={40} />
</Row>
<Layout flexGrow={1} />
Expand Down
2 changes: 0 additions & 2 deletions landing/fragments/landing-services/src/services.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable no-shadow */

import React from 'react'
import { forwardRef } from 'react'

Expand Down Expand Up @@ -52,7 +50,7 @@
<Box height='min-content' width='100%'>
<Column fill>
{leftSide?.map(({ title, content }) => (
<Column fill>

Check failure on line 53 in landing/fragments/landing-services/src/services.component.tsx

View workflow job for this annotation

GitHub Actions / Lint

(@typescript-eslint/no-shadow): 'title' is already declared in the upper scope. 

'title' is already declared in the upper scope.
Raw output 
  50 |             <Box height='min-content' width='100%'>
  51 |               <Column fill>
> 52 |                 {leftSide?.map(({ title, content }) => (
     |                                   ^
  53 |                   <Column fill>
  54 |                     <Divider />
  55 |                     <Layout flexBasis={[28, 28, 40]} />
<Divider />
<Layout flexBasis={[28, 28, 40]} />
<Accordeon title={title} content={content} />
Expand All @@ -66,7 +64,7 @@
<Box height='min-content' width='100%'>
<Column fill>
{rightSide?.map(({ title, content }) => (
<Column fill>

Check failure on line 67 in landing/fragments/landing-services/src/services.component.tsx

View workflow job for this annotation

GitHub Actions / Lint

(@typescript-eslint/no-shadow): 'title' is already declared in the upper scope. 

'title' is already declared in the upper scope.
Raw output 
  64 |             <Box height='min-content' width='100%'>
  65 |               <Column fill>
> 66 |                 {rightSide?.map(({ title, content }) => (
     |                                    ^
  67 |                   <Column fill>
  68 |                     <Divider />
  69 |                     <Layout flexBasis={[28, 28, 40]} />
<Divider />
<Layout flexBasis={[28, 28, 40]} />
<Accordeon title={title} content={content} />
Expand Down
12 changes: 5 additions & 7 deletions landing/pages/index-page/src/queries/services.query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,15 @@ const runServicesQuery = async () => {

const relocationId = ['cG9zdDo2MDI=', 'cG9zdDo2MDM=']

const data = servicesData.mainServices.nodes.filter(node => relocationId[0] !== (node.id) && relocationId[1] !== node.id)
const data = servicesData.mainServices.nodes.filter(
(node) => relocationId[0] !== node.id && relocationId[1] !== node.id
)

if (servicesData) {
return {
services: {
RU: data.filter(
(servicesFragment) => servicesFragment.language.code === 'RU'
),
EN: data.filter(
(servicesFragment) => servicesFragment.language.code === 'EN'
),
RU: data.filter((servicesFragment) => servicesFragment.language.code === 'RU'),
EN: data.filter((servicesFragment) => servicesFragment.language.code === 'EN'),
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
"husky": "8.0.1",
"typescript": "4.4.4"
},
"packageManager": "yarn@3.6.1"
"packageManager": "yarn@4.1.0"
}
Loading