Skip to content

Commit eb6de1a

Browse files
krutilovkrutilov
committed
Merge branch 'nextjs-front-page' into ktl-1123-nextjs-front-page-why-kotlin
# Conflicts: # next.config.js # package.json # pages/index.tsx # yarn.lock
2 parents ed96144 + 23d01f7 commit eb6de1a

File tree

63 files changed

+1119
-130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1119
-130
lines changed

‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.3.0
1+
16.20.2

‎.teamcity/builds/apiReferences/templates/BuildApiReferenceSearchIndex.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ object BuildApiReferenceSearchIndex : Template({
1414
script {
1515
name = "Install npm dependencies"
1616
scriptContent = "yarn install --frozen-lockfile"
17-
dockerImage = "node:14-alpine"
17+
dockerImage = "node:16-alpine"
1818
}
1919
script {
2020
name = "Build Search Index"
2121
scriptContent = "node ./scripts/search/index.js"
22-
dockerImage = "node:14-alpine"
22+
dockerImage = "node:16-alpine"
2323
}
2424
}
2525

‎.teamcity/builds/apiReferences/templates/PrepareDokkaTemplate.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ object PrepareDokkaTemplate: Template({
2424
scriptContent = """
2525
yarn install --frozen-lockfile
2626
""".trimIndent()
27-
dockerImage = "node:14-alpine"
27+
dockerImage = "node:16-alpine"
2828
}
2929
script {
3030
name = "Build Templates"
3131
scriptContent = """
3232
node ./scripts/dokka/generate-templates.js
3333
""".trimIndent()
34-
dockerImage = "node:14-alpine"
34+
dockerImage = "node:16-alpine"
3535
}
3636
}
3737

‎.teamcity/builds/kotlinlang/buidTypes/BuildJsAssets.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object BuildJsAssets: BuildType({
3030
3131
NODE_ENV=production yarn run build
3232
""".trimIndent()
33-
dockerImage = "node:14"
33+
dockerImage = "node:16"
3434
dockerImagePlatform = ScriptBuildStep.ImagePlatform.Linux
3535
dockerPull = true
3636
}

‎.teamcity/tests/buildTypes/ApiReferencesTemplateTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object ApiReferencesTemplateTest: BuildType({
2323
yarn install --frozen-lockfile
2424
yarn build:production
2525
""".trimIndent()
26-
dockerImage = "node:14-alpine"
26+
dockerImage = "node:16-alpine"
2727
}
2828
script {
2929
scriptContent = "./scripts/dokka/up.sh"

‎blocks/community/community-banner/community-banner.module.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@media (min-width: 1280px) {
2121
.content {
22-
margin: 96px 710px 108px 0;
22+
margin: 96px 496px 108px 0;
2323
max-width: 724px;
2424
}
2525

@@ -30,7 +30,7 @@
3030
.image {
3131
position: absolute;
3232
display: block;
33-
width: 723px;
33+
width: 476px;
3434
right: 0;
3535
top: -64px;
3636
}

‎blocks/community/community-banner/community-banner.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ interface CommunityBannerProps {
1212

1313
export const CommunityBanner: FC<CommunityBannerProps> = ({ title, children }) => {
1414
return (
15-
<div className={classNames('ktl-container', styles.banner)} data-test="community-banner">
15+
<div className={classNames('ktl-layout', 'ktl-layout--center', styles.banner)} data-test="community-banner">
1616
<div className={styles.content}>
1717
<div className="ktl-hero" dangerouslySetInnerHTML={{ __html: title }} />
1818
<div className={classNames('ktl-text-1', styles.text)}>{children}</div>
1919
</div>
2020
<div className={styles.image}>
21-
<Img src={communityBanner} sizes={[723]} densities={[1, 2]} alt={'Community Banner Image'}/>
21+
<Img src={communityBanner} sizes={[476]} densities={[1, 2]} alt={'Community Banner Image'}/>
2222
</div>
2323
</div>
2424
);

‎blocks/community/event-list/event-list.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ export const EventList = () => {
135135

136136
return (
137137
<div className={styles.wrapper}>
138-
<div className={'ktl-container'}>
138+
<div className={'ktl-layout ktl-layout--center'}>
139139
<h1 className={'ktl-h1'}>Events</h1>
140140

141141
<div className={styles.actions}>

‎blocks/community/keep-in-touch/keep-in-touch.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ interface KeepInTouchProps {
1313
export const KeepInTouch: FC<KeepInTouchProps> = ({ links }) => {
1414
return (
1515
<div className={classNames(styles.wrapper)}>
16-
<section className="ktl-container">
16+
<section className="ktl-layout ktl-layout--center">
1717
<h2 className="ktl-h1">Keep in Touch</h2>
1818
<div className={classNames(styles.grid, 'ktl-offset-top-l')}>
1919
{links.map((link) => (

‎blocks/community/kugs-banner/kugs-banner.module.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
}
44

55
.text {
6-
max-width: 740px;
6+
max-width: 690px;
77
}
88

99
.content {

‎blocks/community/layout/community-layout.tsx

+7-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Head from 'next/head';
55
import GlobalHeader, { COMMUNITY_TITLE, COMMUNITY_URL } from '@jetbrains/kotlin-web-site-ui/out/components/header';
66
import GlobalFooter from '@jetbrains/kotlin-web-site-ui/out/components/footer';
77
import TopMenu from '@jetbrains/kotlin-web-site-ui/out/components/top-menu';
8-
import CtaBlock from '@jetbrains/kotlin-web-site-ui/out/components/cta-block';
8+
import { CtaBlock } from '@jetbrains/kotlin-web-site-ui/out/components/cta-block-v2';
99
import Button from '@rescui/button';
1010
import { ThemeProvider } from '@rescui/ui-contexts';
1111
import { useRouter } from 'next/router';
@@ -125,13 +125,15 @@ export const CommunityLayout: FC<CommunityLayoutProps> = ({ title, ogImageName,
125125
Write to us
126126
</Button>
127127
}
128-
>
129-
<div className={'ktl-hero ktl-hero_theme_dark'}>
128+
mainTitle={
129+
<>
130130
Give us your feedback or ask any questions
131131
<br />
132132
you have about the Kotlin community
133-
</div>
134-
</CtaBlock>
133+
</>
134+
}
135+
/>
136+
135137

136138
<ThemeProvider theme={theme}>
137139
<GlobalFooter />

‎blocks/main/divider-line/divider-line.module.css

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@import "@jetbrains/kotlin-web-site-ui/out/components/breakpoints/media.pcss";
2+
3+
.divider {
4+
height: 1px;
5+
background: rgba(25, 25, 28, 0.20);
6+
margin-top: 96px;
7+
8+
@media (--ktl-tm) {
9+
margin-top: 48px;
10+
}
11+
12+
@media (--ktl-ts) {
13+
display: none;
14+
}
15+
}

‎blocks/main/divider-line/divider-line.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import React from "react";
2+
3+
import styles from './divider-line.module.css';
4+
5+
export const DividerLine = () => {
6+
return (
7+
<div className={styles.divider} />
8+
)
9+
};

‎blocks/main/foundation-preview/foundation-preview.module.css

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
@import "@jetbrains/kotlin-web-site-ui/out/components/breakpoints/media.pcss";
2+
3+
.foundationPreview {
4+
border-radius: 8px;
5+
background: #E8E8E8;
6+
padding: 32px;
7+
margin-top: 96px;
8+
height: 320px;
9+
box-sizing: border-box;
10+
display: flex;
11+
flex-direction: column;
12+
position: relative;
13+
overflow: hidden;
14+
}
15+
16+
.foundationPreviewImage {
17+
position: absolute;
18+
top: 0;
19+
right: 0;
20+
width: 434px;
21+
height: 320px;
22+
z-index: 1;
23+
}
24+
25+
.title {
26+
margin: 0;
27+
z-index: 2;
28+
}
29+
30+
.description {
31+
margin-top: 8px;
32+
flex: 1 1 auto;
33+
z-index: 2;
34+
}
35+
36+
.secondBlock {
37+
display: flex;
38+
justify-content: space-between;
39+
align-items: flex-start;
40+
z-index: 2;
41+
}
42+
43+
.companies {
44+
display: flex;
45+
gap: 16px;
46+
}
47+
48+
@media (--ktl-tl) {
49+
.foundationPreview {
50+
padding: 72px 24px;
51+
height: auto;
52+
align-items: center;
53+
}
54+
55+
.secondBlock {
56+
display: flex;
57+
flex-direction: column;
58+
align-items: center;
59+
}
60+
61+
.companies {
62+
flex-wrap: wrap;
63+
justify-content: center;
64+
margin-top: 48px;
65+
max-width: 376px;
66+
}
67+
68+
.title {
69+
text-align: center;
70+
}
71+
72+
.description {
73+
max-width: 300px;
74+
text-align: center;
75+
}
76+
77+
.companies {
78+
gap: 12px;
79+
}
80+
81+
.buttonWrap {
82+
margin-top: 48px;
83+
}
84+
}
85+
86+
@media (--ktl-ds) {
87+
.foundationPreviewImage {
88+
right: -48px;
89+
top: -6px;
90+
}
91+
}
92+
93+
@media (--ktl-tl) {
94+
.foundationPreviewImage {
95+
top: auto;
96+
right: -120px;
97+
bottom: -120px;
98+
transform: rotate(115deg);
99+
}
100+
}
101+
102+
@media (--ktl-tm) {
103+
.foundationPreview {
104+
margin-top: 48px;
105+
}
106+
}
107+
108+
@media (--ktl-ts) {
109+
.foundationPreview {
110+
margin-top: 72px;
111+
}
112+
}
113+
114+
@media (--ktl-mm) {
115+
.foundationPreview {
116+
margin-left: -24px;
117+
margin-right: -24px;
118+
border-radius: 0;
119+
}
120+
}

‎blocks/main/foundation-preview/foundation-preview.tsx

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
import React, { FC, ReactNode } from "react";
2+
3+
import { useTextStyles } from '@rescui/typography';
4+
import classNames from 'classnames';
5+
6+
import styles from './foundation-preview.module.css';
7+
8+
import foundationPreviewImg from '../../../public/images/main/foundation-preview.png';
9+
import Image from 'next/image';
10+
11+
interface FoundationPreviewProps {
12+
title: string;
13+
description: string;
14+
button: ReactNode;
15+
companies: {
16+
name: string;
17+
logo: ImgSrc;
18+
}[];
19+
}
20+
21+
export const FoundationPreview: FC<FoundationPreviewProps> = ({title, description, button, companies}) => {
22+
const textCn = useTextStyles();
23+
24+
return (
25+
<div className={styles.foundationPreview}>
26+
<Image
27+
src={foundationPreviewImg}
28+
width={434}
29+
height={320}
30+
alt=""
31+
className={styles.foundationPreviewImage}
32+
/>
33+
34+
<h2 className={classNames(textCn('rs-h2'), styles.title)}>{title}</h2>
35+
36+
<div className={classNames(textCn('rs-text-2'), styles.description)}>{description}</div>
37+
38+
<div className={styles.secondBlock}>
39+
<div className={styles.companies}>
40+
{companies.map(company => (
41+
<img src={company.logo.src} alt={`${company.name} logo`} className={styles.companyLogo} key={company.name} />
42+
))}
43+
</div>
44+
<div className={styles.buttonWrap}>
45+
{button}
46+
</div>
47+
</div>
48+
</div>
49+
);
50+
}

‎blocks/main/hero/hero.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const HeroSection: FC<Props> = ({ children }) => {
4141
Get Started
4242
</Button>
4343
<div className={styles.developer}>
44-
<img src={JBLogo.src} alt="jetbrains logo" className={styles.developerLogo} />r{' '}
44+
<img src={JBLogo.src} alt="jetbrains logo" className={styles.developerLogo} />{' '}
4545
<div className={darkTextCn('rs-text-3', { hardness: 'hard' })}>
4646
Kotlin, developed by&nbsp;
4747
<a

0 commit comments

Comments
 (0)