Skip to content

Commit f5840bf

Browse files
committed
Merge branch 'main' into CAI-644-add-clickhouse
2 parents f8f5591 + c8dae53 commit f5840bf

File tree

10 files changed

+73
-38
lines changed

10 files changed

+73
-38
lines changed

.changeset/hot-hounds-wish.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"nextjs-website": patch
3+
---
4+
5+
Update code inline styling

.changeset/sour-toys-move.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"nextjs-website": patch
3+
---
4+
5+
Add indentation for h3 level guide in page menu items and a left continous border, add hover effect with changing background color for all items in guide in page menu

.github/workflows/sync_gitbook_docs.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ jobs:
123123
NEXT_PUBLIC_COGNITO_REGION: ${{ vars.NEXT_PUBLIC_COGNITO_REGION || 'eu-south-1' }}
124124
run: npm run generate-strapi-response-files -w gitbook-docs
125125

126+
- name: Sync docs folder to S3
127+
if: inputs.generate_metadata_only == false
128+
working-directory: ./devportal-docs
129+
run: |
130+
aws s3 sync docs s3://devportal-${{ env.ENV_SHORT }}-website-static-content/devportal-docs/docs --delete ${{ inputs.incremental_mode == true && ' --size-only' || '' }}
131+
126132
- name: Generate guides metadata
127133
if: inputs.metadata_type == 'guides' || inputs.metadata_type == 'all'
128134
env:
@@ -161,12 +167,6 @@ jobs:
161167
NEXT_PUBLIC_COGNITO_REGION: ${{ vars.NEXT_PUBLIC_COGNITO_REGION || 'eu-south-1' }}
162168
run: npm run generate-release-notes-metadata -w gitbook-docs
163169

164-
- name: Sync docs folder to S3
165-
if: inputs.generate_metadata_only == false
166-
working-directory: ./devportal-docs
167-
run: |
168-
aws s3 sync docs s3://devportal-${{ env.ENV_SHORT }}-website-static-content/devportal-docs/docs --delete ${{ inputs.incremental_mode == true && ' --size-only' || '' }}
169-
170170
- name: Invalidate CloudFront asset bucket cache
171171
run: |
172172
aws cloudfront create-invalidation \

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,15 @@ The summary you provide here will be added to the `CHANGELOG.md` file. Follow th
159159
4. **Creating a Pull Request**: after generating the changelog, the workflow will create a PR with the proposed changes, which include version bumping and updating the `CHANGELOG.md` file.
160160

161161
5. **Updating the PR**: if additional changes are made while the PR is open, the changeset's bot will automatically update the PR based on the changes in the `.changeset` folder.
162+
163+
## SOAP API Sync
164+
165+
Launch the SOAP API sync manually from GitHub Actions.
166+
167+
Steps:
168+
169+
1. Open the repository’s Actions tab.
170+
2. Select the workflow named Sync SOAP API Repo.
171+
3. Click Run workflow and confirm.
172+
173+
No automatic schedule or trigger is configured due to the low frequency of SOAP API repository updates. Run it only when the upstream SOAP API repo has changed.

apps/nextjs-website/src/components/atoms/GuideMenu/GuideMenu.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { SITE_HEADER_HEIGHT } from '@/components/molecules/SiteHeader/SiteHeader
2424
import { useScrollUp } from '../ProductHeader/useScrollUp';
2525
import GuideMenuItems, { type GuideMenuItemsProps } from './Menu';
2626
import { useTranslations } from 'next-intl';
27+
import { PRODUCT_HEADER_HEIGHT } from '../ProductHeader/ProductHeader';
2728

2829
type GuideMenuProps = GuideMenuItemsProps & {
2930
distanceFromTop?: number;
@@ -50,7 +51,7 @@ const GuideMenu = (menuProps: GuideMenuProps) => {
5051
? {
5152
xs: topOffsetXs + 62,
5253
sm: topOffsetXs + 90,
53-
md: SITE_HEADER_HEIGHT + 25,
54+
md: SITE_HEADER_HEIGHT + PRODUCT_HEADER_HEIGHT,
5455
}
5556
: {
5657
xs: topOffsetXs,
@@ -135,7 +136,7 @@ const GuideMenu = (menuProps: GuideMenuProps) => {
135136
>
136137
<Stack
137138
sx={{
138-
padding: { lg: '80px 0' },
139+
padding: { lg: '28px 0' },
139140
flexGrow: { lg: 0 },
140141
flexShrink: { lg: 0 },
141142
}}

apps/nextjs-website/src/components/organisms/GitBookContent/components/Item.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ const Item = ({ children }: ItemProps<ReactNode>) => {
88
<Typography
99
component='li'
1010
variant='body1'
11-
style={{
12-
wordBreak: 'break-word',
13-
margin: '0px 0px 8px',
14-
}}
1511
sx={{
12+
fontSize: '0.937rem',
1613
'& div.MuiContainer-root:has(img)': {
1714
width: 'initial',
1815
marginLeft: '1rem',
@@ -25,6 +22,8 @@ const Item = ({ children }: ItemProps<ReactNode>) => {
2522
'.list-item-container, div.list-item-container > *': {
2623
fontSize: '1rem',
2724
},
25+
margin: '0px 0px 8px',
26+
wordBreak: 'break-word',
2827
}}
2928
>
3029
<div className='list-item-container'>{children}</div>

apps/nextjs-website/src/components/organisms/GitBookContent/components/StyledText.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@ const StyledText = ({ style, children }: StyledTextProps) => {
1212
variant='monospaced'
1313
component='span'
1414
sx={{
15-
paddingY: 0.5,
16-
paddingX: 1,
15+
color: palette.grey[800],
16+
paddingY: 0,
17+
paddingX: '4px',
1718
backgroundColor: palette.background.default,
19+
fontWeight: 600,
20+
borderRadius: '5px',
1821
}}
1922
>
2023
{children}

apps/nextjs-website/src/components/organisms/GuideInPageMenu/GuideInPageMenu.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const GuideInPageMenu = ({
124124
sx={{
125125
maxHeight: `calc(100vh - ${headerOffset}px)`,
126126
overflowY: 'auto',
127-
paddingTop: '50px',
127+
paddingY: '50px',
128128
}}
129129
>
130130
<Typography
@@ -133,6 +133,7 @@ const GuideInPageMenu = ({
133133
fontWeight={700}
134134
textTransform={'uppercase'}
135135
marginBottom={'18px'}
136+
marginLeft='8px'
136137
>
137138
{title}
138139
</Typography>

apps/nextjs-website/src/components/organisms/GuideInPageMenu/components/Heading.tsx

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,55 @@
22
import { HeadingProps } from 'gitbook-docs/markdoc/schema/heading';
33
import React, { ReactNode, useCallback } from 'react';
44
import MUILink from '@mui/material/Link';
5-
import { Typography, useTheme } from '@mui/material';
5+
import { Box, Typography, useTheme } from '@mui/material';
66
import { useFragment } from '@/components/organisms/FragmentProvider/FragmentProvider';
77

88
const Heading = ({ level, id, children }: HeadingProps<ReactNode>) => {
99
const isString = typeof children === 'string';
1010
const { palette } = useTheme();
1111
const { fragment, setFragment } = useFragment();
1212
const isCurrentFragment = fragment === `#${id}`;
13+
const isLevel2 = level === 2;
1314

1415
const handleClick = useCallback(() => {
1516
setFragment(`#${id}`, { source: 'manual', suppressAutoForMs: 1500 });
1617
}, [id, setFragment]);
1718

1819
return (
19-
<MUILink
20-
href={`#${id}`}
21-
title={isString ? children : ''}
22-
onClick={handleClick}
20+
<Box
2321
sx={{
24-
display: 'block',
25-
fontFamily: 'Titillium Web',
26-
marginBottom: '12px',
27-
textDecoration: 'none',
22+
borderLeft: isLevel2 ? 'none' : `.5px solid ${palette.grey[300]}`,
23+
marginLeft: isLevel2 ? '0px' : '9px',
24+
marginTop: isLevel2 ? '8px' : '0',
25+
paddingLeft: '8px',
26+
paddingY: '6px',
27+
':hover': { backgroundColor: palette.action.hover },
2828
}}
2929
>
30-
<Typography
30+
<MUILink
31+
href={`#${id}`}
32+
title={isString ? children : ''}
33+
onClick={handleClick}
3134
sx={{
32-
color: isCurrentFragment
33-
? palette.primary.main
34-
: palette.text.secondary,
35-
fontSize: level === 2 ? 15 : 13,
36-
fontWeight: 400,
35+
display: 'block',
36+
fontFamily: 'Titillium Web',
37+
textDecoration: 'none',
3738
}}
3839
>
39-
{children}
40-
</Typography>
41-
</MUILink>
40+
<Typography
41+
sx={{
42+
color: isCurrentFragment
43+
? palette.primary.main
44+
: palette.text.secondary,
45+
fontSize: isLevel2 ? 15 : 13,
46+
fontWeight: 400,
47+
marginLeft: isLevel2 ? '0px' : '8px',
48+
}}
49+
>
50+
{children}
51+
</Typography>
52+
</MUILink>
53+
</Box>
4254
);
4355
};
4456

apps/nextjs-website/src/components/templates/GitBookTemplate/GitBookTemplate.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ const GitBookTemplate = ({
4848
xs: '30px',
4949
md: '65px',
5050
};
51-
const headersOffset = hasHeader
52-
? `${SITE_HEADER_HEIGHT + PRODUCT_HEADER_HEIGHT}px`
53-
: '0px';
5451

5552
return (
5653
<FragmentProvider>
@@ -96,9 +93,9 @@ const GitBookTemplate = ({
9693
{hasInPageMenu && (
9794
<Box
9895
sx={{
99-
display: { xs: 'none', lg: 'initial' },
96+
display: { lg: 'none', xl: 'initial' },
10097
position: 'relative',
101-
padding: { lg: '0 64px 0 32px' },
98+
padding: { lg: '0 32px', xl: '0 64px 0 32px' },
10299
width: { lg: '378px' },
103100
}}
104101
>

0 commit comments

Comments
 (0)