Skip to content
Open
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
11 changes: 11 additions & 0 deletions src/sections/Advice/components/AdviceSlip.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const AdviceSlip = ({advice, fetchAdvice, saveToFavourites}) => {
return (
<section className="adivce-slip">
<h3>Some Advice</h3>
<p>{advice}</p>
<button onClick={fetchAdvice}>Get More Advice</button>
<button onClick={saveToFavourites}>Save to Favourites</button>
</section>
)
}
export default AdviceSlip;
13 changes: 13 additions & 0 deletions src/sections/Advice/components/FavouriteSlipsList.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const FavouriteSlipsList = ({favourites}) => {
return (
<section className="favourtite-slips-list">
<h3>Favourite Advice Slips</h3>
{favourites.map((advice, index) => (
<li key={index}>
<p>{advice}</p>
</li>
))}
</section>
)
}
export default FavouriteSlipsList;
35 changes: 33 additions & 2 deletions src/sections/Advice/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,40 @@
import { useEffect, useState } from "react"
import AdviceSlip from "./components/AdviceSlip";
import FavouriteSlipsList from "./components/FavouriteSlipsList";

function AdviceSection() {
const url = "https://api.adviceslip.com/advice";
const [advice, setAdvice] = useState("");
const [favourites, setFavourites] = useState([]);

const fetchAdvice = async () => {
console.log("Fetching advice");
const response = await fetch(url);
const jsonData = await response.json();
setAdvice(jsonData.slip.advice);
}

const saveToFavourites = () => {
if (favourites.includes(advice)) {
return;
}
setFavourites((prevFavourites) => [...prevFavourites, advice]);
console.log("Added advice");
}

useEffect( () => {
fetchAdvice();
} , []);

return (
<section>
<h2>Advice Section</h2>
<section className="adivce-slip"></section>
<section className="favourtite-slips-list"></section>
<AdviceSlip
advice={advice}
fetchAdvice={fetchAdvice}
saveToFavourites={saveToFavourites}
/>
<FavouriteSlipsList favourites={favourites}/>
</section>
)
}
Expand Down
25 changes: 25 additions & 0 deletions src/sections/Art/components/ArtList.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import ArtListItem from "./ArtListItem";

const ArtList = ({data, baseImgUrl}) => {

return (
<>
<div className="scroll-container">
<ul className="art-list" style ={{listStyleType: 'none'}}>
{data.map((art, i) => (
<li key={i}>
<ArtListItem
imageURL={baseImgUrl + art.imageURL}
title={art.title}
artist={art.artist}
pubHistory={art.publicationHistory}
/>
</li>
))}
</ul>
</div>
</>
)
}

export default ArtList
18 changes: 18 additions & 0 deletions src/sections/Art/components/ArtListItem.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import PublicationHistoryList from "./PublicationHistoryList";

const ArtListItem = ({imageURL, title, artist, pubHistory}) => {

return (
<div>
<div className="frame">
<img src={imageURL} />
</div>
<h3>{title}</h3>
<p>Artist: {artist}</p>
<h4>Publication history:</h4>
<PublicationHistoryList data={pubHistory}/>
</div>
)
}

export default ArtListItem;
10 changes: 10 additions & 0 deletions src/sections/Art/components/PublicationHistoryList.jsx
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
const PublicationHistoryList = ({ data }) => {

return (
<ul>
{data.map((item, j) => (
<li key={j}>{item}</li>
))}
</ul>
)
}
export default PublicationHistoryList;
19 changes: 18 additions & 1 deletion src/sections/Art/index.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
import { useEffect, useState } from "react"
import ArtList from "./components/ArtList";

function ArtsSection() {

const url = "https://boolean-uk-api-server.fly.dev/art";
const baseImgUrl = "https://boolean-uk-api-server.fly.dev";
const [data, setData] = useState([]);

useEffect( () => {
const fetchData = async () => {
const response = await fetch(url);
const jsonData = await response.json();
setData(jsonData)
}
fetchData();
} , []);

return (
<section>
<h2>Arts Section</h2>
<div className="scroll-container"></div>
<ArtList data={data} baseImgUrl={baseImgUrl}/>
</section>
)
}
Expand Down
20 changes: 20 additions & 0 deletions src/sections/Users/components/UsersList.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import UserListItem from "./UsersListItem";

const UserList = ( {data} ) => {
return (
<ul className="users-list" style ={{listStyleType: 'none'}}>
{data.map( (user, index) => (
<UserListItem
key={index}
image={user.profileImage}
firstName={user.firstName}
lastName={user.lastName}
email={user.email}
favColor={user.favouriteColour}
/>
))}
</ul>
)
}

export default UserList;
11 changes: 11 additions & 0 deletions src/sections/Users/components/UsersListItem.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
const UserListItem = ({image, firstName, lastName, email, favColor}) => {
return (
<li style={{backgroundColor: `${favColor}`}}>
<img src={image} alt={`${firstName} ${lastName}`}/>
<h3>{`${firstName} ${lastName}`}</h3>
<p>Email: {email}</p>
</li>
)
}

export default UserListItem;
20 changes: 19 additions & 1 deletion src/sections/Users/index.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
import {useState, useEffect} from "react";
import UserList from "./components/UsersList";

function UsersSection() {

const url = "https://boolean-uk-api-server.fly.dev/hansjhaland/contact";
const [data, setData] = useState([]);

useEffect( () => {
const fetchData = async () => {
const response = await fetch(url);
const jsonData = await response.json();
setData(jsonData)
}
fetchData();
} , []);

return (
<section>
<h2>Users Section</h2>
<div className="scroll-container"></div>
<div className="scroll-container">
<UserList data={data}/>
</div>
</section>
)
}
Expand Down