Scipaper/Frontend
5
0
Fork 0
Code Issues 15 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'resolve the margin of topic in the article info and article content pages' (#151) from fix/fetch-article into develop

Browse Source 
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/151
This commit is contained in:
Daniel Weissmall 2022-10-17 11:53:40 +00:00
commit 93cefd9ce3
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/fetchAnArticle/AnArticle.tsx
View File

@ -33,7 +33,7 @@ const AnArticle = () => {
<AskeletonArticle /> <AskeletonArticle />
) : ( ) : (
<> <>
<ArticlePart.Article.Breadcumbs> <ArticlePart.Article.Breadcumbs className="py-4">
{article?.topic} {article?.topic}
</ArticlePart.Article.Breadcumbs> </ArticlePart.Article.Breadcumbs>
<div className="flex flex-col gap-4 pb-4"> <div className="flex flex-col gap-4 pb-4">
@ -52,25 +52,18 @@ const AnArticle = () => {
/> />
{article?.tags && ( {article?.tags && (
<div className="keywords my-10 flex flex-col gap-2"> <div className="keywords my-10 flex flex-col gap-2">
<Typography <Typography className="text-2xl" fontWeightVariant="semibold">
className="text-2xl" {t("articlePage.keywords")}
fontWeightVariant="semibold"
>
{t('articlePage.keywords')}
</Typography> </Typography>
<ArticlePart.Article.Keywords className="transition ease-in-out delay-50"> <ArticlePart.Article.Keywords className="transition ease-in-out delay-50">
{article?.tags} {article?.tags}
</ArticlePart.Article.Keywords> </ArticlePart.Article.Keywords>
</div> </div>
)} )}
<div className="abstract my-10 flex flex-col gap-2"> <div className="abstract my-10 flex flex-col gap-2">
<Typography <Typography className="text-2xl" fontWeightVariant="semibold">
className="text-2xl" {t("articlePage.abstract")}
fontWeightVariant="semibold"
>
{t('articlePage.abstract')}
</Typography> </Typography>
<ArticlePart.Article.Description> <ArticlePart.Article.Description>
{article?.summary !== undefined ? ( {article?.summary !== undefined ? (

4
src/components/fetchAnArticle/AnArticleBody.tsx
View File

@ -27,7 +27,7 @@ const AnArticleBody = () => {
<Container variant="straight"> <Container variant="straight">
{shouldShowLoading ? ( {shouldShowLoading ? (
<> <>
<Skeleton count={1} /> <Skeleton count={1} className="my-4" />
<div className="gap-4 py-12 px-20"> <div className="gap-4 py-12 px-20">
<Skeleton <Skeleton
count={1} count={1}
@ -39,7 +39,7 @@ const AnArticleBody = () => {
</> </>
) : ( ) : (
<> <>
<ArticlePart.Article.Breadcumbs> <ArticlePart.Article.Breadcumbs className="py-4">
{article?.topic} {article?.topic}
</ArticlePart.Article.Breadcumbs> </ArticlePart.Article.Breadcumbs>
<div className="gap-4 py-12 px-20"> <div className="gap-4 py-12 px-20">

2
src/components/fetchAnArticle/AskeletonArticle.tsx
View File

@ -3,7 +3,7 @@ import "react-loading-skeleton/dist/skeleton.css";
const AskeletonArticle = () => { const AskeletonArticle = () => {
return ( return (
<> <>
<Skeleton count={1} /> <Skeleton count={1} className="my-4" />
<div className="flex flex-col gap-4 pb-4"> <div className="flex flex-col gap-4 pb-4">
<Skeleton count={1} containerClassName="title w-3/4 text-2xl" /> <Skeleton count={1} containerClassName="title w-3/4 text-2xl" />
<Skeleton count={1} containerClassName="authors w-1/4" /> <Skeleton count={1} containerClassName="authors w-1/4" />