Skip to content

[week6][이진서] 과제 제출 #20

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

Open
JINSEO0201 wants to merge 2 commits into
base: jinseo-week6
Choose a base branch
from
Open

[week6][이진서] 과제 제출 #20

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
1fdac76
.
JINSEO0201 Apr 30, 2024
73e59de
feat
JINSEO0201 May 2, 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
24 changes: 24 additions & 0 deletions src/routes/FavouriteHistoryPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,30 @@ function FavouriteHistoryPage() {
const getImages = async () => {
try {
// ### TO DO ###
const response = await axios.get(
`https://api.thecatapi.com/v1/favourites?sub_id=${userId}`,
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
},
}
);

const data = response.data;
const imageSet = [];

data.map((e) => {
imageSet.push({
id: e.image.id,
url: e.image.url,
isFavourite: true,
favouriteId: e.id,
});
});

setImages(imageSet);
// #############
} catch (err) {
console.log(err);
Expand Down
63 changes: 63 additions & 0 deletions src/routes/MainPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,31 @@ function HomePage() {
const getImages = async () => {
try {
// ### TO DO ###
const response = await axios.get(
"https://api.thecatapi.com/v1/images/search?limit=8&size=small",
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
},
}
);

const data = response.data;
console.log(data);
const imageSet = [];

data.map((e) => {
imageSet.push({
id: e.id,
url: e.url,
isFavourite: false,
favouriteId: null,
});
});
console.log(imageSet);
setImages(imageSet);
// #############
} catch (err) {
console.log(err);
Expand All @@ -25,6 +50,27 @@ function HomePage() {
const favouritingImage = async (imgId) => {
try {
// ### TO DO ###
const response = await axios.post(
"https://api.thecatapi.com/v1/favourites",
{
image_id: imgId,
sub_id: userId,
},
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
},
}
);

const newImages = [...images];
const idx = newImages.findIndex((e) => e.id === imgId);
newImages[idx].isFavourite = true;
newImages[idx].favouriteId = response.data.id;

setImages(newImages);
// #############
} catch (err) {
console.log(err);
Expand All @@ -34,6 +80,23 @@ function HomePage() {
const unFavouritingImage = async (favouriteId) => {
try {
// ### TO DO ###
const newImages = [...images];
const idx = newImages.findIndex((e) => e.favouriteId === favouriteId);
newImages[idx].isFavourite = false;
newImages[idx].favouriteId = null;

setImages(newImages);

const response = await axios.delete(
`https://api.thecatapi.com/v1/favourites/${favouriteId}`,
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
},
}
);
// #############
} catch (err) {
console.log(err);
Expand Down
16 changes: 14 additions & 2 deletions src/routes/VoteHistoryPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,19 @@ function VoteHistoryPage() {

const getImages = async () => {
try {
let response;
let response = await axios.get(
"https://api.thecatapi.com/v1/votes?limit=8&order=DESC",
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
}
}
)
// ### TO DO ###
console.log(response)
Copy link

@unknownburphy unknownburphy May 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR을 날릴 때 이런 console.log 들은 정리하시는 습관을 들이는게 좋습니다!


// #############
const data = response.data;
const imageSet = [];
Expand Down Expand Up @@ -64,8 +75,9 @@ function VoteHistoryPage() {
<img
key={img.url}
src={img.url}
className={`object-cover w-full h-full border-[3px] border-[#FF6841] rounded-xl
className={`object-cover w-full h-full border-[3px] rounded-xl
### FILL ME ###
${img.value > 0 ? "border-red-600" : "border-blue-600"}
Copy link

@unknownburphy unknownburphy May 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

삼항연산자를 활용해 잘 처리하신 것 같습니다!

`}
/>
</div>
Expand Down
84 changes: 78 additions & 6 deletions src/routes/VotePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,73 @@ function VotePage() {
const navigate = useNavigate();
const userId = getCookie("userId");

const [image, setImage] = useState();
const [voteId, setVoteId] = useState();
const [thumbsUpImage, setThumbsUpImage] = useState(
require("../assets/images/thumbs-up-icon.png")
);
const [thumbsDownImage, setThumbsDownImage] = useState(
require("../assets/images/thumbs-down-icon.png")
);

const [clickThumbsUpImage, setClickThumbsUpImage] = useState(
require("../assets/images/thumbs-up-click.png")
);
const [clickThumbsDownImage, setClickThumbsDownImage] = useState(
require("../assets/images/thumbs-down-click.png")
);

const [isHoveringUp, setIsHoveringUp] = useState(false);
const [isHoveringDown, setIsHoveringDown] = useState(false);

const handleThumbsUpHover = () => {
setIsHoveringUp(true);
};

const handleThumbsUpLeave = () => {
setIsHoveringUp(false);
};

const handleThumbsDownHover = () => {
setIsHoveringDown(true);
};

const handleThumbsDownLeave = () => {
setIsHoveringDown(false);
};

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

const getImage = async () => {
try {
// ### TO DO ###
const response = await axios.get(
"https://api.thecatapi.com/v1/images/search?limit=1&size=small",
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
},
}
);
console.log(response);
const data = response.data;

const imageOne = data.map((e) => {
return e.url;
});

const voteIdOne = data.map((e) => {
return e.id;
});
console.log(voteIdOne);

setVoteId(voteIdOne);

setImage(imageOne);
Comment on lines +65 to +76
Copy link

@unknownburphy unknownburphy May 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

두 개를 각각 처리하지 않고 dict를 활용해 한번에 처리할 수도 있을 것 같네요! useState도 하나만 써서 말이죠. 이렇게 하면 불필요한 변수 사용을 줄일 수 있습니다!

// #############
} catch (err) {
console.log(err);
Expand All @@ -30,7 +83,21 @@ function VotePage() {
const vote = async (val) => {
try {
// ### TO DO ###
// #############
const response = await axios.post(
"https://api.thecatapi.com/v1/votes",
{
image_id: voteId,
sub_id: userId,
value: val,
},
{
headers: {
"Content-Type": "application/json",
"x-api-key":
"live_uJIAOk7Z9jClOkYFxqI4332RzBXawDl1l8L0n9wZehDHhuIW2a7rL92pd2AzyXCX",
},
}
);
} catch (err) {
console.log(err);
}
Expand Down Expand Up @@ -62,19 +129,24 @@ function VotePage() {
<div className="w-2/3 h-2/3 py-2 border-4 rounded-2xl border-[#FF6841] flex justify-center items-center">
<div className="w-full h-[90%] flex justify-evenly items-center">
<img
// ### ONE CAT IMAGE ###
/* 여기 */
src={image}
className="w-3/5 h-full border-[3px] rounded-xl border-[#FF6841]"
/>
<div className="w-1/3 flex gap-12 justify-center">
<img
src={thumbsUpImage}
src={isHoveringUp ? clickThumbsUpImage : thumbsUpImage}
className="w-20 h-20 cursor-pointer"
// ### thumbsUpImage Event ###
onClick={() => vote(1)}
onMouseOver={handleThumbsUpHover}
onMouseOut={handleThumbsUpLeave}
/>
<img
src={thumbsDownImage}
src={isHoveringDown ? clickThumbsDownImage : thumbsDownImage}
className="w-20 h-20 cursor-pointer"
// ### thumbsDownImage Event ###
onClick={() => vote(-1)}
onMouseOver={handleThumbsDownHover}
onMouseOut={handleThumbsDownLeave}
/>
</div>
</div>
Expand Down