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.

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

use bio paragraph #304

Merged
merged 1 commit into from
Mar 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions components/Paragraph/Paragraph.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,22 @@ const lyrics =
const about =
"Karly-Marina Loaiza, professionally known as Kali Uchis, is a Colombian-American singer-songwriter, record producer, music video director and fashion designer. She writes and produces most of her own music. The stylistic range of left-field pop artist Kali Uchis is reflected in the variety of her collaborators – an extensive genre-crossing list that includes Tyler, the Creator, Gorillaz, Daniel Caesar, Juanes, and BadBadNotGood.";

const bio = `Jermaine Lamarr Cole (born January 28, 1985), better known by his stage name J. Cole, is an American hip hop recording artist and record producer. Born in Frankfurt, Germany, Raised in Fayetteville, North Carolina, Cole posted songs on various internet forums at the age of 14 under the name "Blaza", but later switched to the name "Therapist".

Cole initially gained recognition as a rapper following the release of his debut mixtape, The Come Up, in early 2007 in which he also founded his record label Dreamville with label president Ibrahim Hamad. Intent on further pursuing a solo career as a rapper, he went on to release two additional mixtapes The Warm Up in 2009 and Friday Night Lights in 2010, after signing to Jay Z's Roc Nation imprint in 2009.

Cole released his debut studio album, Cole World: The Sideline Story, on September 27, 2011, which included the lead single "Work out". It debuted at number one on the U.S. Billboard 200, and was soon certified platinum by the Recording Industry Association of America (RIAA).

In June 18, 2013, Cole released his second studio album Born Sinner. Born Sinner sold 297,000 copies in its first week of release, and peaked at number one in it's third week of release. The album received mostly positive reviews from critics. On September 15, 2020, Born Sinner was certified double platinum. The album was supported by the lead single Power Trip with R&B artist Miguel, which was released on February 14.

On December 9, 2014, Cole, released his third studio album "2014 Forest Hills Drive". It was also the first album in 25 years at that time that went 3 times platinum with absolutely no features. The album debuted at number one on the Billboard 200, selling 353,000 copies in its first week and was certified platinum on March 31, 2015. The latter earned him his first Grammy Award nomination for Best Rap Album. The album was later accompanied by two documentaries "J. Cole: Road to Homecoming" in the period of December 16, 2015 – January 9, 2016 & "Forest Hills Drive: Homecoming" on January 9, 2016.

On 9 December, 2016, Cole released his fourth studio album "4 Your Eyez Only". The album debuted at number one on the Billboard 200 chart with 492,000 album-equivalent units, of which 363,000 were pure album sales, becoming Cole's fourth number one album. On January 12, 2017, the album was certified gold and certified platinum by the Recording Industry Association of America (RIAA) on April 7, 2017.

On April 20, 2018 Cole released his 5th studio album "KOD", after he revealed the album name two days after and held a couple listening sessions. The album featured his new alter ego kiLL edward under which he released the single "Tidal Wave (just a little reference)" on April 18th, 2018, 2 days before releasing KOD. The album was recieved with positive reviews from critics and debuted atop the US Billboard 200, selling 397,000 album-equivalent units in its first week (174,000 coming from pure sales), earning Cole his fifth consecutive number-one album in the country. The album broke several streaming records at the time of the release. On December 5, 2018 the album was certified platinum.

Cole released a 2 song EP called "Lewis Street" on July 22, 2020, which included the single "The Climb Back", which would later be featured on his 6th studio album. On May 7, 2021, Cole released the lead single "Interlude" one week before releasing his 6th studio album. Cole's 6th studio album "The Off-Season" was released on May 14, 2021. The album sold 282,000 album-equivalent units in its first week and would earn Cole his sixth consecutive number-one album in the country. 4 of the 12 songs debuted on the top ten on the US Billboard Hot 100, with the song "My Life" featuring 21 Savage & Morray peaking at number 2.`;

export const Lyrics = {
render: ({ children }: PropsWithChildren): ReactElement => {
return (
Expand All @@ -43,3 +59,9 @@ export const About = {
children: about,
},
};

export const Bio = {
args: {
children: bio,
},
};
6 changes: 4 additions & 2 deletions components/Paragraph/Paragraph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ export default function Paragraph(
p {
color: #b3b3b3;
font-weight: 400;
letter-spacing: -0.04em;
margin: 0;
white-space: pre-wrap;
white-space: pre-line;
font-size: 1rem;
line-height: 1.5rem;
text-transform: none;
letter-spacing: normal;
max-width: 672px;
padding-top: 16px;
padding-right: 20px;
}
`}</style>
</p>
Expand Down
39 changes: 17 additions & 22 deletions pages/artist/[artistId].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
FollowButton,
Heading,
PageHeader,
Paragraph,
PlayButton,
PlaylistTopBarExtraField,
SetList,
Expand Down Expand Up @@ -267,13 +268,21 @@ export default function ArtistPage({
{translations.pages.artist.about}
</Heading>
{showMoreAbout ? (
<p
dangerouslySetInnerHTML={{ __html: artistInfo?.bio?.content }}
></p>
<Paragraph>
<span
dangerouslySetInnerHTML={{
__html: artistInfo?.bio?.content,
}}
></span>
</Paragraph>
) : (
<p
dangerouslySetInnerHTML={{ __html: artistInfo?.bio?.summary }}
></p>
<Paragraph>
<span
dangerouslySetInnerHTML={{
__html: artistInfo?.bio?.summary,
}}
></span>
</Paragraph>
)}
<TextToggleButton
isToggle={showMoreAbout}
Expand All @@ -296,7 +305,7 @@ export default function ArtistPage({
)}
{setLists ? (
<div className="attribution">
<p>
<Paragraph>
{translations.pages.artist.concertSetlistOn}{" "}
<a
href="https://www.setlist.fm/"
Expand All @@ -305,7 +314,7 @@ export default function ArtistPage({
>
setlist.fm
</a>
</p>
</Paragraph>
</div>
) : null}
</div>
Expand Down Expand Up @@ -351,20 +360,6 @@ export default function ArtistPage({
max-height: 400px;
aspect-ratio: 1;
}
p {
font-size: 1rem;
line-height: 1.5rem;
text-transform: none;
letter-spacing: normal;
box-sizing: border-box;
font-family: "Lato", sans-serif;
margin: 0px;
font-weight: 400;
color: #9e9e9e;
max-width: 672px;
padding-top: 16px;
padding-right: 20px;
}
.options {
display: flex;
padding: 0 32px;
Expand Down
Loading