From 37959214c0f0c08f1b60320e8a961c8c8e88ab45 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 13 May 2025 10:51:17 +0200 Subject: [PATCH 01/15] refactor: 887 - refactor partnered module --- src/widgets/partnered/index.ts | 2 +- src/widgets/partnered/partnered.scss | 42 ------------------- src/widgets/partnered/partnered.tsx | 23 ---------- .../partnered/ui/partnered.module.scss | 41 ++++++++++++++++++ .../partnered/{ => ui}/partnered.test.tsx | 2 +- src/widgets/partnered/ui/partnered.tsx | 27 ++++++++++++ 6 files changed, 70 insertions(+), 67 deletions(-) delete mode 100644 src/widgets/partnered/partnered.scss delete mode 100644 src/widgets/partnered/partnered.tsx create mode 100644 src/widgets/partnered/ui/partnered.module.scss rename src/widgets/partnered/{ => ui}/partnered.test.tsx (88%) create mode 100644 src/widgets/partnered/ui/partnered.tsx diff --git a/src/widgets/partnered/index.ts b/src/widgets/partnered/index.ts index ce7324459..7ceecaa82 100644 --- a/src/widgets/partnered/index.ts +++ b/src/widgets/partnered/index.ts @@ -1 +1 @@ -export { Partnered } from './partnered'; +export { Partnered } from './ui/partnered'; diff --git a/src/widgets/partnered/partnered.scss b/src/widgets/partnered/partnered.scss deleted file mode 100644 index a11e91633..000000000 --- a/src/widgets/partnered/partnered.scss +++ /dev/null @@ -1,42 +0,0 @@ -.partnered { - &.content { - display: flex; - flex-direction: column; - - & .title { - font-size: 36px; - font-weight: $font-weight-medium; - line-height: 44px; - color: $color-black; - letter-spacing: 0; - } - - & .partners { - display: flex; - flex-flow: row wrap; - align-items: center; - align-self: center; - justify-content: space-between; - - width: 100%; - max-width: 500px; - padding: 16px; - - .partner-logo-container { - display: flex; - flex-basis: 20%; - align-items: center; - justify-content: center; - - @include media-tablet { - flex-basis: 50%; - } - } - - @include media-tablet { - row-gap: 16px; - padding: 16px 0; - } - } - } -} diff --git a/src/widgets/partnered/partnered.tsx b/src/widgets/partnered/partnered.tsx deleted file mode 100644 index 6e65df3ff..000000000 --- a/src/widgets/partnered/partnered.tsx +++ /dev/null @@ -1,23 +0,0 @@ -import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; -import { WidgetTitle } from '@/shared/ui/widget-title'; - -import './partnered.scss'; - -export const Partnered = () => ( -
-
- Partnered with -
-
- -
-
- -
-
- -
-
-
-
-); diff --git a/src/widgets/partnered/ui/partnered.module.scss b/src/widgets/partnered/ui/partnered.module.scss new file mode 100644 index 000000000..884423421 --- /dev/null +++ b/src/widgets/partnered/ui/partnered.module.scss @@ -0,0 +1,41 @@ +.partnered-content { + display: flex; + flex-direction: column; + + .title { + font-size: 36px; + font-weight: $font-weight-medium; + line-height: 44px; + color: $color-black; + letter-spacing: 0; + } + + .partners { + display: flex; + flex-flow: row wrap; + align-items: center; + align-self: center; + justify-content: space-between; + + width: 100%; + max-width: 500px; + padding: 16px; + + .partner-logo-container { + display: flex; + flex-basis: 20%; + align-items: center; + justify-content: center; + + @include media-mobile { + flex-basis: 50%; + padding: 24px 0; + } + } + + @include media-tablet { + row-gap: 16px; + padding: 16px 0; + } + } +} diff --git a/src/widgets/partnered/partnered.test.tsx b/src/widgets/partnered/ui/partnered.test.tsx similarity index 88% rename from src/widgets/partnered/partnered.test.tsx rename to src/widgets/partnered/ui/partnered.test.tsx index 530617680..635038915 100644 --- a/src/widgets/partnered/partnered.test.tsx +++ b/src/widgets/partnered/ui/partnered.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; -import { Partnered } from '.'; +import { Partnered } from './partnered'; describe('Partnered', () => { it('should render Partnered component', () => { diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx new file mode 100644 index 000000000..182b4f8df --- /dev/null +++ b/src/widgets/partnered/ui/partnered.tsx @@ -0,0 +1,27 @@ +import classNames from 'classnames/bind'; + +import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; +import { WidgetTitle } from '@/shared/ui/widget-title'; + +import styles from './partnered.module.scss'; + +const cx = classNames.bind(styles); + +export const Partnered = () => ( +
+
+ Partnered with +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+
+); From 232ea9dfea23b979bd133797b63d3d667317ce03 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 13 May 2025 13:45:20 +0200 Subject: [PATCH 02/15] fix: 887 - revert wrong commit --- src/widgets/partnered/index.ts | 2 +- src/widgets/partnered/partnered.scss | 42 +++++++++++++++++++ .../partnered/{ui => }/partnered.test.tsx | 2 +- src/widgets/partnered/partnered.tsx | 23 ++++++++++ .../partnered/ui/partnered.module.scss | 41 ------------------ src/widgets/partnered/ui/partnered.tsx | 27 ------------ 6 files changed, 67 insertions(+), 70 deletions(-) create mode 100644 src/widgets/partnered/partnered.scss rename src/widgets/partnered/{ui => }/partnered.test.tsx (88%) create mode 100644 src/widgets/partnered/partnered.tsx delete mode 100644 src/widgets/partnered/ui/partnered.module.scss delete mode 100644 src/widgets/partnered/ui/partnered.tsx diff --git a/src/widgets/partnered/index.ts b/src/widgets/partnered/index.ts index 7ceecaa82..ce7324459 100644 --- a/src/widgets/partnered/index.ts +++ b/src/widgets/partnered/index.ts @@ -1 +1 @@ -export { Partnered } from './ui/partnered'; +export { Partnered } from './partnered'; diff --git a/src/widgets/partnered/partnered.scss b/src/widgets/partnered/partnered.scss new file mode 100644 index 000000000..a11e91633 --- /dev/null +++ b/src/widgets/partnered/partnered.scss @@ -0,0 +1,42 @@ +.partnered { + &.content { + display: flex; + flex-direction: column; + + & .title { + font-size: 36px; + font-weight: $font-weight-medium; + line-height: 44px; + color: $color-black; + letter-spacing: 0; + } + + & .partners { + display: flex; + flex-flow: row wrap; + align-items: center; + align-self: center; + justify-content: space-between; + + width: 100%; + max-width: 500px; + padding: 16px; + + .partner-logo-container { + display: flex; + flex-basis: 20%; + align-items: center; + justify-content: center; + + @include media-tablet { + flex-basis: 50%; + } + } + + @include media-tablet { + row-gap: 16px; + padding: 16px 0; + } + } + } +} diff --git a/src/widgets/partnered/ui/partnered.test.tsx b/src/widgets/partnered/partnered.test.tsx similarity index 88% rename from src/widgets/partnered/ui/partnered.test.tsx rename to src/widgets/partnered/partnered.test.tsx index 635038915..530617680 100644 --- a/src/widgets/partnered/ui/partnered.test.tsx +++ b/src/widgets/partnered/partnered.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; -import { Partnered } from './partnered'; +import { Partnered } from '.'; describe('Partnered', () => { it('should render Partnered component', () => { diff --git a/src/widgets/partnered/partnered.tsx b/src/widgets/partnered/partnered.tsx new file mode 100644 index 000000000..6e65df3ff --- /dev/null +++ b/src/widgets/partnered/partnered.tsx @@ -0,0 +1,23 @@ +import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; +import { WidgetTitle } from '@/shared/ui/widget-title'; + +import './partnered.scss'; + +export const Partnered = () => ( +
+
+ Partnered with +
+
+ +
+
+ +
+
+ +
+
+
+
+); diff --git a/src/widgets/partnered/ui/partnered.module.scss b/src/widgets/partnered/ui/partnered.module.scss deleted file mode 100644 index 884423421..000000000 --- a/src/widgets/partnered/ui/partnered.module.scss +++ /dev/null @@ -1,41 +0,0 @@ -.partnered-content { - display: flex; - flex-direction: column; - - .title { - font-size: 36px; - font-weight: $font-weight-medium; - line-height: 44px; - color: $color-black; - letter-spacing: 0; - } - - .partners { - display: flex; - flex-flow: row wrap; - align-items: center; - align-self: center; - justify-content: space-between; - - width: 100%; - max-width: 500px; - padding: 16px; - - .partner-logo-container { - display: flex; - flex-basis: 20%; - align-items: center; - justify-content: center; - - @include media-mobile { - flex-basis: 50%; - padding: 24px 0; - } - } - - @include media-tablet { - row-gap: 16px; - padding: 16px 0; - } - } -} diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx deleted file mode 100644 index 182b4f8df..000000000 --- a/src/widgets/partnered/ui/partnered.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import classNames from 'classnames/bind'; - -import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; -import { WidgetTitle } from '@/shared/ui/widget-title'; - -import styles from './partnered.module.scss'; - -const cx = classNames.bind(styles); - -export const Partnered = () => ( -
-
- Partnered with -
    -
  • - -
    • -
  • - -
    • -
  • - -
    • -
-
-
-); From 05895b491e945e8e2c4787745518c1e485024317 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 13 May 2025 13:51:12 +0200 Subject: [PATCH 03/15] refactor: 887 - refactor partnered module --- src/widgets/partnered/partnered.module.scss | 41 ++++++++++++++++++++ src/widgets/partnered/partnered.scss | 42 --------------------- src/widgets/partnered/partnered.test.tsx | 2 +- src/widgets/partnered/partnered.tsx | 30 ++++++++------- 4 files changed, 59 insertions(+), 56 deletions(-) create mode 100644 src/widgets/partnered/partnered.module.scss delete mode 100644 src/widgets/partnered/partnered.scss diff --git a/src/widgets/partnered/partnered.module.scss b/src/widgets/partnered/partnered.module.scss new file mode 100644 index 000000000..884423421 --- /dev/null +++ b/src/widgets/partnered/partnered.module.scss @@ -0,0 +1,41 @@ +.partnered-content { + display: flex; + flex-direction: column; + + .title { + font-size: 36px; + font-weight: $font-weight-medium; + line-height: 44px; + color: $color-black; + letter-spacing: 0; + } + + .partners { + display: flex; + flex-flow: row wrap; + align-items: center; + align-self: center; + justify-content: space-between; + + width: 100%; + max-width: 500px; + padding: 16px; + + .partner-logo-container { + display: flex; + flex-basis: 20%; + align-items: center; + justify-content: center; + + @include media-mobile { + flex-basis: 50%; + padding: 24px 0; + } + } + + @include media-tablet { + row-gap: 16px; + padding: 16px 0; + } + } +} diff --git a/src/widgets/partnered/partnered.scss b/src/widgets/partnered/partnered.scss deleted file mode 100644 index a11e91633..000000000 --- a/src/widgets/partnered/partnered.scss +++ /dev/null @@ -1,42 +0,0 @@ -.partnered { - &.content { - display: flex; - flex-direction: column; - - & .title { - font-size: 36px; - font-weight: $font-weight-medium; - line-height: 44px; - color: $color-black; - letter-spacing: 0; - } - - & .partners { - display: flex; - flex-flow: row wrap; - align-items: center; - align-self: center; - justify-content: space-between; - - width: 100%; - max-width: 500px; - padding: 16px; - - .partner-logo-container { - display: flex; - flex-basis: 20%; - align-items: center; - justify-content: center; - - @include media-tablet { - flex-basis: 50%; - } - } - - @include media-tablet { - row-gap: 16px; - padding: 16px 0; - } - } - } -} diff --git a/src/widgets/partnered/partnered.test.tsx b/src/widgets/partnered/partnered.test.tsx index 530617680..635038915 100644 --- a/src/widgets/partnered/partnered.test.tsx +++ b/src/widgets/partnered/partnered.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; -import { Partnered } from '.'; +import { Partnered } from './partnered'; describe('Partnered', () => { it('should render Partnered component', () => { diff --git a/src/widgets/partnered/partnered.tsx b/src/widgets/partnered/partnered.tsx index 6e65df3ff..182b4f8df 100644 --- a/src/widgets/partnered/partnered.tsx +++ b/src/widgets/partnered/partnered.tsx @@ -1,23 +1,27 @@ +import classNames from 'classnames/bind'; + import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; import { WidgetTitle } from '@/shared/ui/widget-title'; -import './partnered.scss'; +import styles from './partnered.module.scss'; + +const cx = classNames.bind(styles); export const Partnered = () => ( -
-
+
+
Partnered with -
-
+
    +
  • -
-
+ +
  • -
    • -
    + +
  • -
    • -
    -
    -
    + + + + ); From 5d290eed194b722bc9c5c7cbf39bef0c9dc4dbaa Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 13 May 2025 13:53:57 +0200 Subject: [PATCH 04/15] fix: 887 - revert wrong commit --- src/widgets/partnered/partnered.module.scss | 41 -------------------- src/widgets/partnered/partnered.scss | 42 +++++++++++++++++++++ src/widgets/partnered/partnered.test.tsx | 2 +- src/widgets/partnered/partnered.tsx | 30 +++++++-------- 4 files changed, 56 insertions(+), 59 deletions(-) delete mode 100644 src/widgets/partnered/partnered.module.scss create mode 100644 src/widgets/partnered/partnered.scss diff --git a/src/widgets/partnered/partnered.module.scss b/src/widgets/partnered/partnered.module.scss deleted file mode 100644 index 884423421..000000000 --- a/src/widgets/partnered/partnered.module.scss +++ /dev/null @@ -1,41 +0,0 @@ -.partnered-content { - display: flex; - flex-direction: column; - - .title { - font-size: 36px; - font-weight: $font-weight-medium; - line-height: 44px; - color: $color-black; - letter-spacing: 0; - } - - .partners { - display: flex; - flex-flow: row wrap; - align-items: center; - align-self: center; - justify-content: space-between; - - width: 100%; - max-width: 500px; - padding: 16px; - - .partner-logo-container { - display: flex; - flex-basis: 20%; - align-items: center; - justify-content: center; - - @include media-mobile { - flex-basis: 50%; - padding: 24px 0; - } - } - - @include media-tablet { - row-gap: 16px; - padding: 16px 0; - } - } -} diff --git a/src/widgets/partnered/partnered.scss b/src/widgets/partnered/partnered.scss new file mode 100644 index 000000000..a11e91633 --- /dev/null +++ b/src/widgets/partnered/partnered.scss @@ -0,0 +1,42 @@ +.partnered { + &.content { + display: flex; + flex-direction: column; + + & .title { + font-size: 36px; + font-weight: $font-weight-medium; + line-height: 44px; + color: $color-black; + letter-spacing: 0; + } + + & .partners { + display: flex; + flex-flow: row wrap; + align-items: center; + align-self: center; + justify-content: space-between; + + width: 100%; + max-width: 500px; + padding: 16px; + + .partner-logo-container { + display: flex; + flex-basis: 20%; + align-items: center; + justify-content: center; + + @include media-tablet { + flex-basis: 50%; + } + } + + @include media-tablet { + row-gap: 16px; + padding: 16px 0; + } + } + } +} diff --git a/src/widgets/partnered/partnered.test.tsx b/src/widgets/partnered/partnered.test.tsx index 635038915..530617680 100644 --- a/src/widgets/partnered/partnered.test.tsx +++ b/src/widgets/partnered/partnered.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; -import { Partnered } from './partnered'; +import { Partnered } from '.'; describe('Partnered', () => { it('should render Partnered component', () => { diff --git a/src/widgets/partnered/partnered.tsx b/src/widgets/partnered/partnered.tsx index 182b4f8df..6e65df3ff 100644 --- a/src/widgets/partnered/partnered.tsx +++ b/src/widgets/partnered/partnered.tsx @@ -1,27 +1,23 @@ -import classNames from 'classnames/bind'; - import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; import { WidgetTitle } from '@/shared/ui/widget-title'; -import styles from './partnered.module.scss'; - -const cx = classNames.bind(styles); +import './partnered.scss'; export const Partnered = () => ( -
    -
    +
    +
    Partnered with -
      -
    • +
      +
      -
      • -
    • +
    +
    - -
  • +
    • +
    - - -
    -
    + + + + ); From 974cd798830d2b559f8bc517b76d0daa1127a219 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 13 May 2025 13:59:32 +0200 Subject: [PATCH 05/15] refactor: 887 - refactor partnered module --- src/widgets/partnered/partnered.scss | 61 ++++++++++++------------ src/widgets/partnered/partnered.test.tsx | 2 +- src/widgets/partnered/partnered.tsx | 31 +++++++----- 3 files changed, 49 insertions(+), 45 deletions(-) diff --git a/src/widgets/partnered/partnered.scss b/src/widgets/partnered/partnered.scss index a11e91633..884423421 100644 --- a/src/widgets/partnered/partnered.scss +++ b/src/widgets/partnered/partnered.scss @@ -1,42 +1,41 @@ -.partnered { - &.content { +.partnered-content { + display: flex; + flex-direction: column; + + .title { + font-size: 36px; + font-weight: $font-weight-medium; + line-height: 44px; + color: $color-black; + letter-spacing: 0; + } + + .partners { display: flex; - flex-direction: column; + flex-flow: row wrap; + align-items: center; + align-self: center; + justify-content: space-between; - & .title { - font-size: 36px; - font-weight: $font-weight-medium; - line-height: 44px; - color: $color-black; - letter-spacing: 0; - } + width: 100%; + max-width: 500px; + padding: 16px; - & .partners { + .partner-logo-container { display: flex; - flex-flow: row wrap; + flex-basis: 20%; align-items: center; - align-self: center; - justify-content: space-between; + justify-content: center; - width: 100%; - max-width: 500px; - padding: 16px; - - .partner-logo-container { - display: flex; - flex-basis: 20%; - align-items: center; - justify-content: center; - - @include media-tablet { - flex-basis: 50%; - } + @include media-mobile { + flex-basis: 50%; + padding: 24px 0; } + } - @include media-tablet { - row-gap: 16px; - padding: 16px 0; - } + @include media-tablet { + row-gap: 16px; + padding: 16px 0; } } } diff --git a/src/widgets/partnered/partnered.test.tsx b/src/widgets/partnered/partnered.test.tsx index 530617680..635038915 100644 --- a/src/widgets/partnered/partnered.test.tsx +++ b/src/widgets/partnered/partnered.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; -import { Partnered } from '.'; +import { Partnered } from './partnered'; describe('Partnered', () => { it('should render Partnered component', () => { diff --git a/src/widgets/partnered/partnered.tsx b/src/widgets/partnered/partnered.tsx index 6e65df3ff..005e7508d 100644 --- a/src/widgets/partnered/partnered.tsx +++ b/src/widgets/partnered/partnered.tsx @@ -1,23 +1,28 @@ +import classNames from 'classnames/bind'; + import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; import { WidgetTitle } from '@/shared/ui/widget-title'; -import './partnered.scss'; +// import styles from './partnered.module.scss'; +const styles = {}; + +const cx = classNames.bind(styles); export const Partnered = () => ( -
    -
    +
    +
    Partnered with -
    -
    +
      +
    • -
    -
    + +
  • -
    • -
    + +
  • -
    • -
    -
    -
    + + + + ); From 128a035d6e397adbe92dd9478349f7ca9e7ecea9 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 13 May 2025 14:04:09 +0200 Subject: [PATCH 06/15] refactor: 887 - move files to ui folder --- src/widgets/partnered/index.ts | 2 +- .../partnered/{partnered.scss => ui/partnered.module.scss} | 0 src/widgets/partnered/{ => ui}/partnered.test.tsx | 0 src/widgets/partnered/{ => ui}/partnered.tsx | 3 +-- 4 files changed, 2 insertions(+), 3 deletions(-) rename src/widgets/partnered/{partnered.scss => ui/partnered.module.scss} (100%) rename src/widgets/partnered/{ => ui}/partnered.test.tsx (100%) rename src/widgets/partnered/{ => ui}/partnered.tsx (92%) diff --git a/src/widgets/partnered/index.ts b/src/widgets/partnered/index.ts index ce7324459..7ceecaa82 100644 --- a/src/widgets/partnered/index.ts +++ b/src/widgets/partnered/index.ts @@ -1 +1 @@ -export { Partnered } from './partnered'; +export { Partnered } from './ui/partnered'; diff --git a/src/widgets/partnered/partnered.scss b/src/widgets/partnered/ui/partnered.module.scss similarity index 100% rename from src/widgets/partnered/partnered.scss rename to src/widgets/partnered/ui/partnered.module.scss diff --git a/src/widgets/partnered/partnered.test.tsx b/src/widgets/partnered/ui/partnered.test.tsx similarity index 100% rename from src/widgets/partnered/partnered.test.tsx rename to src/widgets/partnered/ui/partnered.test.tsx diff --git a/src/widgets/partnered/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx similarity index 92% rename from src/widgets/partnered/partnered.tsx rename to src/widgets/partnered/ui/partnered.tsx index 005e7508d..182b4f8df 100644 --- a/src/widgets/partnered/partnered.tsx +++ b/src/widgets/partnered/ui/partnered.tsx @@ -3,8 +3,7 @@ import classNames from 'classnames/bind'; import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; import { WidgetTitle } from '@/shared/ui/widget-title'; -// import styles from './partnered.module.scss'; -const styles = {}; +import styles from './partnered.module.scss'; const cx = classNames.bind(styles); From 9c22eb61cdd18031893b6be53ec6429bb356c473 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Thu, 15 May 2025 10:52:28 +0200 Subject: [PATCH 07/15] fix: 887 - return div instead of article --- src/widgets/partnered/ui/partnered.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx index 182b4f8df..cb4a31e27 100644 --- a/src/widgets/partnered/ui/partnered.tsx +++ b/src/widgets/partnered/ui/partnered.tsx @@ -9,7 +9,7 @@ const cx = classNames.bind(styles); export const Partnered = () => (
    -
    +
    Partnered with
    • @@ -22,6 +22,6 @@ export const Partnered = () => (
    -
    +
    ); From ec9cc3690d80e97164c54aec489a2b5643ea4979 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Thu, 15 May 2025 10:53:57 +0200 Subject: [PATCH 08/15] fix: 887 - delete unused styles --- src/widgets/partnered/ui/partnered.module.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/widgets/partnered/ui/partnered.module.scss b/src/widgets/partnered/ui/partnered.module.scss index 884423421..89d301754 100644 --- a/src/widgets/partnered/ui/partnered.module.scss +++ b/src/widgets/partnered/ui/partnered.module.scss @@ -2,14 +2,6 @@ display: flex; flex-direction: column; - .title { - font-size: 36px; - font-weight: $font-weight-medium; - line-height: 44px; - color: $color-black; - letter-spacing: 0; - } - .partners { display: flex; flex-flow: row wrap; From 8aa20f50dbe7b3e06dff2416193b82793ab02134 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Thu, 15 May 2025 11:06:07 +0200 Subject: [PATCH 09/15] fix: 887 - rewrite paddings with gaps --- src/widgets/partnered/ui/partnered.module.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/widgets/partnered/ui/partnered.module.scss b/src/widgets/partnered/ui/partnered.module.scss index 89d301754..d4c06d70a 100644 --- a/src/widgets/partnered/ui/partnered.module.scss +++ b/src/widgets/partnered/ui/partnered.module.scss @@ -1,6 +1,7 @@ .partnered-content { display: flex; flex-direction: column; + gap: 16px; .partners { display: flex; @@ -11,7 +12,6 @@ width: 100%; max-width: 500px; - padding: 16px; .partner-logo-container { display: flex; @@ -21,13 +21,15 @@ @include media-mobile { flex-basis: 50%; - padding: 24px 0; } } @include media-tablet { row-gap: 16px; - padding: 16px 0; + } + + @include media-mobile { + row-gap: 48px; } } } From 04a8d357ab268964568a1183af873254cf61cec6 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Thu, 15 May 2025 11:24:17 +0200 Subject: [PATCH 10/15] feat: 887 - add meaningful tests for partnered --- src/shared/icons/github.tsx | 2 +- src/widgets/partnered/ui/partnered.test.tsx | 28 ++++++++++++++++----- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/shared/icons/github.tsx b/src/shared/icons/github.tsx index 30be1aa2c..a9f19e51f 100644 --- a/src/shared/icons/github.tsx +++ b/src/shared/icons/github.tsx @@ -3,5 +3,5 @@ import Image from 'next/image'; import github from '@/shared/assets/svg/github.svg'; export const GithubLogo = () => { - return github icon; + return github icon; }; diff --git a/src/widgets/partnered/ui/partnered.test.tsx b/src/widgets/partnered/ui/partnered.test.tsx index 635038915..d6b134bcc 100644 --- a/src/widgets/partnered/ui/partnered.test.tsx +++ b/src/widgets/partnered/ui/partnered.test.tsx @@ -1,13 +1,29 @@ -import { render } from '@testing-library/react'; +import { render, screen } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; import { Partnered } from './partnered'; +import aws from '@/shared/assets/icons/aws-gray.svg'; +import github from '@/shared/assets/svg/github.svg'; +import jetbrains from '@/shared/assets/svg/jetbrains.svg'; -describe('Partnered', () => { - it('should render Partnered component', () => { - const { getByTestId } = render(); - const partnered = getByTestId('partnered'); +describe('Partnered component', () => { + it('should render the component with correct title', () => { + render(); - expect(partnered).toBeInTheDocument(); + expect(screen.getByText('Partnered with')).toBeInTheDocument(); + + expect(screen.getByTestId('widget-title')).toBeInTheDocument(); + }); + + it('renders the title and logos correctly', () => { + render(); + + const logos = screen.getAllByRole('img'); + + expect(logos).toHaveLength(3); + + expect(screen.getByAltText('jetbrains icon')).toHaveAttribute('src', jetbrains.src); + expect(screen.getByAltText('AWS icon')).toHaveAttribute('src', aws.src); + expect(screen.getByAltText('github icon')).toHaveAttribute('src', github.src); }); }); From 9f27edb6b1ec80948ecb686a5ac8b2ddf9162b3f Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Fri, 16 May 2025 10:08:45 +0200 Subject: [PATCH 11/15] refactor: 887 - move partners logos into array --- src/widgets/partnered/constants.ts | 16 ++++++++++++++++ src/widgets/partnered/ui/partnered.tsx | 16 ++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 src/widgets/partnered/constants.ts diff --git a/src/widgets/partnered/constants.ts b/src/widgets/partnered/constants.ts new file mode 100644 index 000000000..5b7bfea42 --- /dev/null +++ b/src/widgets/partnered/constants.ts @@ -0,0 +1,16 @@ +import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; + +export const partners = [ + { + id: 'jetbrains', + Component: JetBrainsLogo, + }, + { + id: 'aws', + Component: AwsLogo, + }, + { + id: 'github', + Component: GithubLogo, + }, +]; diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx index cb4a31e27..60896b3ae 100644 --- a/src/widgets/partnered/ui/partnered.tsx +++ b/src/widgets/partnered/ui/partnered.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames/bind'; -import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; +import { partners } from '../constants'; import { WidgetTitle } from '@/shared/ui/widget-title'; import styles from './partnered.module.scss'; @@ -12,15 +12,11 @@ export const Partnered = () => (
    Partnered with
      -
    • - -
      • -
    • - -
      • -
    • - -
      • + {partners.map(({ id, Component }) => ( +
    • + +
      • + ))}
    From 4275afc373526be052f2b7ac5b3ab688f329100d Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Fri, 16 May 2025 10:13:15 +0200 Subject: [PATCH 12/15] refactor: 887 - rewrite test for content check --- src/widgets/partnered/ui/partnered.test.tsx | 12 +++++++++--- src/widgets/partnered/ui/partnered.tsx | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/widgets/partnered/ui/partnered.test.tsx b/src/widgets/partnered/ui/partnered.test.tsx index d6b134bcc..43bc0d290 100644 --- a/src/widgets/partnered/ui/partnered.test.tsx +++ b/src/widgets/partnered/ui/partnered.test.tsx @@ -2,17 +2,23 @@ import { render, screen } from '@testing-library/react'; import { describe, expect, it } from 'vitest'; import { Partnered } from './partnered'; +import { partners } from '../constants'; import aws from '@/shared/assets/icons/aws-gray.svg'; import github from '@/shared/assets/svg/github.svg'; import jetbrains from '@/shared/assets/svg/jetbrains.svg'; describe('Partnered component', () => { - it('should render the component with correct title', () => { + it('renders correct content for component', async () => { render(); - expect(screen.getByText('Partnered with')).toBeInTheDocument(); + const title = await screen.findByTestId('widget-title'); + const partnersList = await screen.findByTestId('partners-list'); - expect(screen.getByTestId('widget-title')).toBeInTheDocument(); + expect(title).toBeVisible(); + expect(title.textContent).toBe('Partnered with'); + + expect(partnersList).toBeVisible(); + expect(partnersList.children).toHaveLength(partners.length); }); it('renders the title and logos correctly', () => { diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx index 60896b3ae..c231d9151 100644 --- a/src/widgets/partnered/ui/partnered.tsx +++ b/src/widgets/partnered/ui/partnered.tsx @@ -11,7 +11,7 @@ export const Partnered = () => (
    Partnered with -
      +
        {partners.map(({ id, Component }) => (
      • From 42a5009a9a9c707c008f7f68825103b8884d2a12 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Fri, 16 May 2025 11:08:31 +0200 Subject: [PATCH 13/15] refactor: 887 - rewrite logos test with it.each --- src/shared/icons/aws.tsx | 2 +- src/shared/icons/github.tsx | 2 +- src/shared/icons/jetbrains.tsx | 2 +- src/widgets/partnered/ui/partnered.test.tsx | 41 +++++++++++++++------ 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/shared/icons/aws.tsx b/src/shared/icons/aws.tsx index e615fbc4f..98e3371e4 100644 --- a/src/shared/icons/aws.tsx +++ b/src/shared/icons/aws.tsx @@ -3,5 +3,5 @@ import Image from 'next/image'; import aws from '@/shared/assets/icons/aws-gray.svg'; export const AwsLogo = () => { - return AWS icon; + return AWS icon; }; diff --git a/src/shared/icons/github.tsx b/src/shared/icons/github.tsx index a9f19e51f..3f0a9b78c 100644 --- a/src/shared/icons/github.tsx +++ b/src/shared/icons/github.tsx @@ -3,5 +3,5 @@ import Image from 'next/image'; import github from '@/shared/assets/svg/github.svg'; export const GithubLogo = () => { - return github icon; + return github icon; }; diff --git a/src/shared/icons/jetbrains.tsx b/src/shared/icons/jetbrains.tsx index 2ae6068f1..1d4367ec8 100644 --- a/src/shared/icons/jetbrains.tsx +++ b/src/shared/icons/jetbrains.tsx @@ -3,5 +3,5 @@ import Image from 'next/image'; import jetbrains from '@/shared/assets/svg/jetbrains.svg'; export const JetBrainsLogo = () => { - return jetbrains icon; + return jetbrains icon; }; diff --git a/src/widgets/partnered/ui/partnered.test.tsx b/src/widgets/partnered/ui/partnered.test.tsx index 43bc0d290..40695bb99 100644 --- a/src/widgets/partnered/ui/partnered.test.tsx +++ b/src/widgets/partnered/ui/partnered.test.tsx @@ -7,10 +7,29 @@ import aws from '@/shared/assets/icons/aws-gray.svg'; import github from '@/shared/assets/svg/github.svg'; import jetbrains from '@/shared/assets/svg/jetbrains.svg'; +const partnersLogoData = [ + { + testId: 'jetbrains icon', + alt: 'jetbrains icon', + src: jetbrains.src, + }, + { + testId: 'AWS icon', + alt: 'AWS icon', + src: aws.src, + }, + { + testId: 'github icon', + alt: 'github icon', + src: github.src, + }, +]; + describe('Partnered component', () => { - it('renders correct content for component', async () => { + beforeEach(() => { render(); - + }); + it('renders correct content for component', async () => { const title = await screen.findByTestId('widget-title'); const partnersList = await screen.findByTestId('partners-list'); @@ -21,15 +40,13 @@ describe('Partnered component', () => { expect(partnersList.children).toHaveLength(partners.length); }); - it('renders the title and logos correctly', () => { - render(); - - const logos = screen.getAllByRole('img'); + it.each(partnersLogoData)( + 'renders $testId logo with correct attributes', + ({ testId, alt, src }) => { + const logo = screen.getByTestId(testId); - expect(logos).toHaveLength(3); - - expect(screen.getByAltText('jetbrains icon')).toHaveAttribute('src', jetbrains.src); - expect(screen.getByAltText('AWS icon')).toHaveAttribute('src', aws.src); - expect(screen.getByAltText('github icon')).toHaveAttribute('src', github.src); - }); + expect(logo).toHaveAttribute('alt', alt); + expect(logo).toHaveAttribute('src', src); + }, + ); }); From a0c154beb0b8d6c3b623ce778731e84d6f448158 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Fri, 16 May 2025 12:37:31 +0200 Subject: [PATCH 14/15] refactor: 887 - rewrite alumni with partnered structure --- src/widgets/alumni/ui/alumni.tsx | 16 ++++++++-------- src/widgets/partnered/ui/partnered.tsx | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/widgets/alumni/ui/alumni.tsx b/src/widgets/alumni/ui/alumni.tsx index b3f6fd31a..bb9067d83 100644 --- a/src/widgets/alumni/ui/alumni.tsx +++ b/src/widgets/alumni/ui/alumni.tsx @@ -11,21 +11,21 @@ const cx = classNames.bind(styles); export const Alumni = () => { return ( -
        -
        +
        +
        Our alumni We are immensely proud of RS School alumni who build their successful careers in ambitious IT companies -
        +
          {alumni.map(({ id, image }) => ( -
          +
        • {id} -
          • + ))} -
        -
        -
        +
      +
    +
    ); }; diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx index c231d9151..c93d25fc3 100644 --- a/src/widgets/partnered/ui/partnered.tsx +++ b/src/widgets/partnered/ui/partnered.tsx @@ -8,7 +8,7 @@ import styles from './partnered.module.scss'; const cx = classNames.bind(styles); export const Partnered = () => ( -
    +
    Partnered with
      From 775edd1bf721dab25ba4f2083e650f7c8b4dd324 Mon Sep 17 00:00:00 2001 From: HelenaIsh Date: Tue, 3 Jun 2025 17:49:00 +0200 Subject: [PATCH 15/15] chore: 887 - fix after merge --- src/widgets/partnered/constants.ts | 3 +++ src/widgets/partnered/ui/partnered.module.scss | 2 +- src/widgets/partnered/ui/partnered.tsx | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/widgets/partnered/constants.ts b/src/widgets/partnered/constants.ts index 5b7bfea42..1a5d24634 100644 --- a/src/widgets/partnered/constants.ts +++ b/src/widgets/partnered/constants.ts @@ -3,14 +3,17 @@ import { AwsLogo, GithubLogo, JetBrainsLogo } from '@/shared/icons'; export const partners = [ { id: 'jetbrains', + href: 'https://www.jetbrains.com', Component: JetBrainsLogo, }, { id: 'aws', + href: 'https://aws.amazon.com/', Component: AwsLogo, }, { id: 'github', + href: 'https://github.com/', Component: GithubLogo, }, ]; diff --git a/src/widgets/partnered/ui/partnered.module.scss b/src/widgets/partnered/ui/partnered.module.scss index d4c06d70a..844930ad0 100644 --- a/src/widgets/partnered/ui/partnered.module.scss +++ b/src/widgets/partnered/ui/partnered.module.scss @@ -11,7 +11,7 @@ justify-content: space-between; width: 100%; - max-width: 500px; + max-width: 600px; .partner-logo-container { display: flex; diff --git a/src/widgets/partnered/ui/partnered.tsx b/src/widgets/partnered/ui/partnered.tsx index c93d25fc3..26754794b 100644 --- a/src/widgets/partnered/ui/partnered.tsx +++ b/src/widgets/partnered/ui/partnered.tsx @@ -1,6 +1,7 @@ import classNames from 'classnames/bind'; import { partners } from '../constants'; +import { LinkCustom } from '@/shared/ui/link-custom'; import { WidgetTitle } from '@/shared/ui/widget-title'; import styles from './partnered.module.scss'; @@ -12,9 +13,11 @@ export const Partnered = () => (
      Partnered with
        - {partners.map(({ id, Component }) => ( + {partners.map(({ id, Component, href }) => (
      • - + + +
        • ))}