Skip to content

Article results container #41

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 23, 2024
Merged

Article results container #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f940e
created initial article result layout
Darren52BT Mar 20, 2024
47579ed
completed article results list design
Darren52BT Mar 21, 2024
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
31 changes: 31 additions & 0 deletions frontend/src/Components/ArticleResults/ArticleResult/ArticleResult.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { Image } from "react-bootstrap";
import "./ArticleResult.scss";
import { Bookmark, BookmarkFill } from "react-bootstrap-icons";
export default function ArticleResult({ article, bookmarkToggler }) {
return (
<div className="article-result">
<div className="article-result-image-container">
<Image src={article.image} className="article-result-image" />
{article.isBookmarked ? (
<BookmarkFill
className="article-result-bookmark"
onClick={bookmarkToggler}
/>
) : (
<Bookmark
className="article-result-bookmark"
onClick={bookmarkToggler}
/>
)}
</div>

<div className="article-result-text">
<h3 className="article-result-title">{article.title}</h3>
<div className="article-result-info">
<span className="article-result-author">By {article.author}</span>
<span className="article-result-date">Published {article.date}</span>
</div>
</div>
</div>
);
}
121 changes: 121 additions & 0 deletions frontend/src/Components/ArticleResults/ArticleResult/ArticleResult.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
@import "bootstrap/scss/bootstrap-grid.scss";
@import "bootstrap/scss/grid";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/functions";
@import "../../../scss/variables";
/*overall article result container*/
.article-result {
display: grid;
grid-template-columns: 1fr 6fr;
gap: 20px;
height: 100px;
@include media-breakpoint-up(sm) {
height: 150px;
}
@include media-breakpoint-up(lg) {
grid-template-columns: 250px 5fr;
}
}

/*image*/
.article-result-image-container {
width: fit-content;
position: relative;
display: flex;
height: inherit;
justify-content: center;
margin: auto;
}

.article-result-image {
object-fit: contain;
object-position: center top;
height: 100%;
width: 75px;
@include media-breakpoint-up(sm) {
width: 150px;
}
@include media-breakpoint-up(md) {
width: 200px;
}
}
.article-result-bookmark {
position: absolute;
transform: rotate(-90deg);
top: 0;
right: -10px;
width: fit-content;

&:hover {
cursor: pointer;
}
&:active {
cursor: auto;
}
}

/*Text*/
.article-result-text,
.article-result-info {
display: flex;
flex-direction: column;
}
.article-result-text {
gap: 5px;
}
.article-result-info {
gap: 2.5px;
}

.article-result-title {
font-weight: 600;
margin-bottom: 0 !important;
font-size: calc(0.8rem + 0.5vw);
@include media-breakpoint-up(sm) {
font-size: calc(1.2rem + 0.5vw);
}
/*style for clicking on article title*/
&:hover {
cursor: pointer;
text-decoration: underline;
}
&:active {
cursor: auto;
position: relative;
top: 1px;
opacity: 0.8;
}
}
.article-result-author,
.article-result-date {
font-weight: 300;
font-style: italic;
padding: 0 !important;
font-size: calc(0.8rem + 0.1vw);
@include media-breakpoint-up(sm) {
font-size: calc(0.9rem + 0.1vw);
}
}

//COLOR MODES
@include color-mode(light) {
.article-result-text,
.article-result-author,
.article-result-date {
color: $primary-text-light;
}
.article-result-bookmark {
color: $bookmark-bg-light;
}
}
@include color-mode(dark) {
.article-result-text,
.article-result-author,
.article-result-date {
color: $primary-text-dark;
}
.article-result-bookmark {
color: $bookmark-bg-dark;
}
}
18 changes: 18 additions & 0 deletions frontend/src/Components/ArticleResults/ArticleResultsList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import ArticleResult from "./ArticleResult/ArticleResult";

export default function ArticleResultsList({
articles,
bookmarkTogglerCreator,
}) {
return (
<div className="d-flex flex-column gap-3">
{articles.map((article) => (
<ArticleResult
article={article}
key={article.id}
bookmarkToggler={bookmarkTogglerCreator(article.id)}
/>
))}
</div>
);
}
164 changes: 50 additions & 114 deletions frontend/src/pages/ArticleList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,53 @@ import { useEffect, useState } from "react";
import { Card, Stack } from "react-bootstrap";
import { useParams, useSearchParams } from "react-router-dom";
import LinkedDescriptionBox from "../Components/LinkedDescriptionBox.jsx";

export default function ArticleList({ }) {
const [data,setData] = useState()
const [searchParams, setSearchParams] = useSearchParams()
const [specificArticle, setSpecificArticle] = useState()
const titleQuery = searchParams.get("title")
import ArticleResultsList from "../Components/ArticleResults/ArticleResultsList.jsx";
const dummmy_articles = [
{
id: 1,
image:
"https://emeritus.org/in/wp-content/uploads/sites/3/2023/03/types-of-machine-learning.jpg.optimal.jpg",
title: "Machine Learning in Business and Marketing",
author: "Jeff",
date: "October 24, 2023",
isBookmarked: true,
},
{
id: 2,
image:
"https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcS8QfYW-Re6kMIo_i9D5x4KUHVStLYWGuK4vg&usqp=CAU",
title: "Intro to Machine Learning",
author: "Darren",
date: "October 24, 2023",
isBookmarked: false,
},
];
export default function ArticleList({}) {
const [articles, setArticles] = useState(dummmy_articles);
const [searchParams, setSearchParams] = useSearchParams();
const [specificArticle, setSpecificArticle] = useState();
const titleQuery = searchParams.get("title");
//console.log(titleQuery);

useEffect(()=>
{
//bookmark toggler creator function, returns function that toggles bookmark for certain id
const bookmarkTogglerCreator = (id) => () => {
let articleIndex = articles.findIndex((article) => article.id === id);
if (articleIndex !== -1) {
const newArticles = [...articles];
newArticles[articleIndex].isBookmarked =
!newArticles[articleIndex].isBookmarked;
setArticles(newArticles);
}
};

useEffect(() => {
fetch(`http://localhost:3002/api/articles/?title=${titleQuery}`)
.then((res) => res.json()
.then(data => setData(data)))
.catch((error) =>{
.then((res) => res.json().then((data) => setArticles(data)))
.catch((error) => {
console.error("error fetching data");
})
});

/** if(data && data.length > 0 ){
/** if(data && data.length > 0 ){
const specificArticleId = data[0].id;
fetch(`http://localhost:3002/api/articles/${specificArticleId}`)
.then((res) => res.json())
Expand All @@ -31,11 +60,11 @@ export default function ArticleList({ }) {
console.error("error fetching specific article");
});
} */
},[titleQuery, setSearchParams])
}, [titleQuery, setSearchParams]);

const { id } = useParams();

/* const fetchArticle = async () => {
/* const fetchArticle = async () => {
fetch(`http://localhost:3002/api/articles/?title=${titleQuery}`)
.then((res) => res.json())
.then((data) => {
Expand All @@ -46,106 +75,13 @@ export default function ArticleList({ }) {
console.error("Error fetching item data:", error);
});
} */


if (data == undefined )
{
return <>loading...</>
}
console.log(data);
return (
<>
<div className="mt-5" >
<Stack gap={3}>
<div>
<Card style={{ border: "none" }}>
<Card.Body>
<h4 className="ps-4">Search Results: "{titleQuery}"</h4>
</Card.Body>
</Card>
</div>
{data.map((item) => (
<div>
<LinkedDescriptionBox
title={item.title}
id={item.id}
variant="secondary">
{item.description}
</LinkedDescriptionBox>
</div>
))}
{/* <div>
<LinkedDescriptionBox
title={"Intro to Machine Learning"}
variant="secondary"
>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
enim ad minim veniam, quis nostrud exercitation ullamco laboris
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident,
sunt in culpa qui officia deserunt mollit anim id est laborum.
</LinkedDescriptionBox>
</div>
<div>
<LinkedDescriptionBox
title={"Regressional Analysis"}
variant="secondary"
>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
enim ad minim veniam, quis nostrud exercitation ullamco laboris
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident,
sunt in culpa qui officia deserunt mollit anim id est laborum.
</LinkedDescriptionBox>
</div>
<div>
<LinkedDescriptionBox
title={"Regressional Analysis"}
variant="secondary"
>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
enim ad minim veniam, quis nostrud exercitation ullamco laboris
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident,
sunt in culpa qui officia deserunt mollit anim id est laborum.
</LinkedDescriptionBox>
</div>
<div>
<LinkedDescriptionBox
title={"Regressional Analysis"}
variant="secondary"
>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
enim ad minim veniam, quis nostrud exercitation ullamco laboris
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident,
sunt in culpa qui officia deserunt mollit anim id est laborum.
</LinkedDescriptionBox>
</div>
<div>
<LinkedDescriptionBox
title={"Regressional Analysis"}
variant="secondary"
>
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
enim ad minim veniam, quis nostrud exercitation ullamco laboris
nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat
nulla pariatur. Excepteur sint occaecat cupidatat non proident,
sunt in culpa qui officia deserunt mollit anim id est laborum.
</LinkedDescriptionBox>
</div> */}
</Stack>
</div>
</>
<div className="flex-grow-1">
<ArticleResultsList
articles={dummmy_articles}
bookmarkTogglerCreator={bookmarkTogglerCreator}
/>
</div>
);
}
1 change: 0 additions & 1 deletion frontend/src/pages/BasePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ export default function BasePage() {
<Container fluid className="p-0 min-vh-100 d-flex flex-column">
<Header />
<Outlet />

<Footer />
</Container>
);
Expand Down