-
-
Notifications
You must be signed in to change notification settings - Fork 11
887-refactor: Partners refactor #892
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.
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
Open
HelenaIsh
wants to merge
16
commits into
main
Choose a base branch
from
refactor/887-partners-refactor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
3795921
refactor: 887 - refactor partnered module
HelenaIsh 232ea9d
fix: 887 - revert wrong commit
HelenaIsh 05895b4
refactor: 887 - refactor partnered module
HelenaIsh 5d290ee
fix: 887 - revert wrong commit
HelenaIsh 974cd79
refactor: 887 - refactor partnered module
HelenaIsh 128a035
refactor: 887 - move files to ui folder
HelenaIsh 9c22eb6
fix: 887 - return div instead of article
HelenaIsh ec9cc36
fix: 887 - delete unused styles
HelenaIsh 8aa20f5
fix: 887 - rewrite paddings with gaps
HelenaIsh 04a8d35
feat: 887 - add meaningful tests for partnered
HelenaIsh 9f27edb
refactor: 887 - move partners logos into array
HelenaIsh 4275afc
refactor: 887 - rewrite test for content check
HelenaIsh 42a5009
refactor: 887 - rewrite logos test with it.each
HelenaIsh a0c154b
refactor: 887 - rewrite alumni with partnered structure
HelenaIsh 6881e90
chore: 887 - merge main branch
HelenaIsh 775edd1
chore: 887 - fix after merge
HelenaIsh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 = () => ( | ||
<div className="partnered container" data-testid="partnered"> | ||
<div className="partnered content"> | ||
<section className={cx('partnered-container', 'container')} data-testid="partnered"> | ||
<article className={cx('partnered-content', 'content')}> | ||
<WidgetTitle size="small">Partnered with</WidgetTitle> | ||
<div className="partners"> | ||
<div className="partner-logo-container"> | ||
<ul className={cx('partners')}> | ||
<li className={cx('partner-logo-container')}> | ||
<JetBrainsLogo /> | ||
</div> | ||
<div className="partner-logo-container"> | ||
</li> | ||
<li className={cx('partner-logo-container')}> | ||
<AwsLogo /> | ||
</div> | ||
<div className="partner-logo-container"> | ||
</li> | ||
<li className={cx('partner-logo-container')}> | ||
<GithubLogo /> | ||
</div> | ||
</div> | ||
</div> | ||
</div> | ||
</li> | ||
</ul> | ||
</article> | ||
</section> | ||
); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we use the structure like in
Alumni
widget?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand a point of keeping a similar HTML structure in all our widgets
Difference for now:
Alumni
Partnered
section
tag.article->section->section
structureul->li
tagsTherefore, I suggest to keep partnered html structure in both
partnered
andalumni
widgetsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ansivgit, what do you think?