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.

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

Jump to bottom

Like button works Real-Time and it is a toggle #136

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Like button works Real-Time and it is a toggle #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion com-dict-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@testing-library/user-event": "^7.2.1",
"algoliasearch": "^4.3.1",
"antd": "^4.2.5",
"firebase": "^7.13.1",
"firebase": "^8.10.0",
"firebase-admin": "^11.5.0",
"firebase-functions": "^3.8.0",
"react": "^16.13.1",
Expand Down
32 changes: 25 additions & 7 deletions com-dict-client/src/components/Search/WordSearch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useRef, useState, useEffect } from "react";
import { Typography, Card, Row, Col, Divider, Button, message } from "antd";
import {
SoundOutlined,
Expand Down Expand Up @@ -38,6 +38,8 @@ function WordSearch(props) {
// word_of_the_day,
} = props.data;

const likesCount = useRef(parseInt(likes));
const dislikesCount = useRef(parseInt(dislikes));
const history = useHistory();
const firestore = useFirestore();
const user = useSelector((state) => state.firebase.auth);
Expand All @@ -53,13 +55,21 @@ function WordSearch(props) {
likes: parseInt(likes) + 1,
dislikes: dislikes > 0 ? parseInt(dislikes) - 1 : dislikes,
};
console.log(myLikes, user_likes, new_likes);
if (myLikes.length < 1) {
updateWord(id, new_likes)(firestore);
addLikes(user_likes)(firestore);
myDislikes.length > 0 && deleteDislikes(myDislikes[0].id)(firestore);
myDislikes.length > 0 && (dislikesCount.current -= 1);
likesCount.current += 1;
} else {
return message.error("You already liked.");
let new_likes = {
likes: likes > 0 ? parseInt(likes) - 1 : likes,
dislikes: dislikes,
};
updateWord(id, new_likes)(firestore);
myLikes.length > 0 && deleteLikes(myLikes[0].id)(firestore);
myLikes.length > 0 && (likesCount.current -= 1);
// return message.error("You already liked.");
}
};
const handleDislike = () => {
Expand All @@ -74,13 +84,21 @@ function WordSearch(props) {
dislikes: parseInt(dislikes) + 1,
likes: likes > 0 ? parseInt(likes) - 1 : likes,
};
console.log(myDislikes, user_dislikes, new_dislikes);
if (myDislikes.length < 1) {
updateWord(id, new_dislikes)(firestore);
addDislikes(user_dislikes)(firestore);
myLikes.length > 0 && deleteLikes(myLikes[0].id)(firestore);
myLikes.length > 0 && (likesCount.current -= 1);
dislikesCount.current += 1;
} else {
return message.error("You already disliked.");
let new_dislikes = {
dislikes: dislikes > 0? parseInt(dislikes) - 1: dislikes,
likes: likes,
};
updateWord(id, new_dislikes)(firestore);
myDislikes.length > 0 && deleteDislikes(myDislikes[0].id)(firestore);
myDislikes.length > 0 && (dislikesCount.current -= 1);
// return message.error("You already disliked.");
}
};

Expand Down Expand Up @@ -201,7 +219,7 @@ function WordSearch(props) {
onClick={handleLike}
style={{ fontSize: "4vmin" }}
/>
<Text>{likes}</Text>
<Text>{ likesCount.current }</Text>
</Col>
<Col xl={1} lg={1} md={1} sm={1}>
<Divider
Expand All @@ -216,7 +234,7 @@ function WordSearch(props) {
onClick={handleDislike}
style={{ fontSize: "4vmin" }}
/>
<Text>{dislikes}</Text>
<Text>{ dislikesCount.current }</Text>
</Col>
<Col xl={0} lg={0} md={13} sm={13}></Col>
<Col xl={13} lg={13} md={24} sm={24} style={{ textAlign: "right" }}>
Expand Down
32 changes: 25 additions & 7 deletions com-dict-client/src/components/WordAlpabatical/word.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useRef, useState, useEffect } from "react";
import { Typography, Card, Row, Col, Divider, Button, message } from "antd";
import {
SoundOutlined,
Expand Down Expand Up @@ -38,6 +38,8 @@ function WordCustom(props) {
// word_of_the_day,
} = props.data;

const likesCount = useRef(parseInt(likes));
const dislikesCount = useRef(parseInt(dislikes));
const history = useHistory();
const firestore = useFirestore();
const user = useSelector((state) => state.firebase.auth);
Expand All @@ -53,13 +55,21 @@ function WordCustom(props) {
likes: parseInt(likes) + 1,
dislikes: dislikes > 0 ? parseInt(dislikes) - 1 : dislikes,
};
console.log(myLikes, user_likes, new_likes);
if (myLikes.length < 1) {
updateWord(id, new_likes)(firestore);
addLikes(user_likes)(firestore);
myDislikes.length > 0 && deleteDislikes(myDislikes[0].id)(firestore);
myDislikes.length > 0 && (dislikesCount.current -= 1);
likesCount.current += 1;
} else {
return message.error("You already liked.");
let new_likes = {
likes: likes > 0 ? parseInt(likes) - 1 : likes,
dislikes: dislikes,
};
updateWord(id, new_likes)(firestore);
myLikes.length > 0 && deleteLikes(myLikes[0].id)(firestore);
myLikes.length > 0 && (likesCount.current -= 1);
// return message.error("You already liked.");
}
};
const handleDislike = () => {
Expand All @@ -74,13 +84,21 @@ function WordCustom(props) {
dislikes: parseInt(dislikes) + 1,
likes: likes > 0 ? parseInt(likes) - 1 : likes,
};
console.log(myDislikes, user_dislikes, new_dislikes);
if (myDislikes.length < 1) {
updateWord(id, new_dislikes)(firestore);
addDislikes(user_dislikes)(firestore);
myLikes.length > 0 && deleteLikes(myLikes[0].id)(firestore);
myLikes.length > 0 && (likesCount.current -= 1);
dislikesCount.current += 1;
} else {
return message.error("You already disliked.");
let new_dislikes = {
dislikes: dislikes > 0? parseInt(dislikes) - 1: dislikes,
likes: likes,
};
updateWord(id, new_dislikes)(firestore);
myDislikes.length > 0 && deleteDislikes(myDislikes[0].id)(firestore);
myDislikes.length > 0 && (dislikesCount.current -= 1);
// return message.error("You already disliked.");
}
};

Expand Down Expand Up @@ -201,7 +219,7 @@ function WordCustom(props) {
onClick={handleLike}
style={{ fontSize: "4vmin" }}
/>
<Text>{likes}</Text>
<Text>{ likesCount.current }</Text>
</Col>
<Col xl={1} lg={1} md={1} sm={1}>
<Divider
Expand All @@ -216,7 +234,7 @@ function WordCustom(props) {
onClick={handleDislike}
style={{ fontSize: "4vmin" }}
/>
<Text>{dislikes}</Text>
<Text>{ dislikesCount.current }</Text>
</Col>
<Col xl={0} lg={0} md={13} sm={13}></Col>
<Col xl={13} lg={13} md={24} sm={24} style={{ textAlign: "right" }}>
Expand Down
32 changes: 25 additions & 7 deletions com-dict-client/src/components/WordHome/wordSimple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useRef, useState, useEffect } from "react";
import { Typography, Card, Row, Col, Divider, Button, message } from "antd";
import {
SoundOutlined,
Expand Down Expand Up @@ -38,6 +38,8 @@ function WordSimple(props) {
word_of_the_day,
} = props.data;

const likesCount = useRef(parseInt(likes));
const dislikesCount = useRef(parseInt(dislikes));
const history = useHistory();
const firestore = useFirestore();
const user = useSelector((state) => state.firebase.auth);
Expand All @@ -53,13 +55,21 @@ function WordSimple(props) {
likes: parseInt(likes) + 1,
dislikes: dislikes > 0 ? parseInt(dislikes) - 1 : dislikes,
};
console.log(myLikes, user_likes, new_likes);
if (myLikes.length < 1) {
updateWord(id, new_likes)(firestore);
addLikes(user_likes)(firestore);
myDislikes.length > 0 && deleteDislikes(myDislikes[0].id)(firestore);
myDislikes.length > 0 && (dislikesCount.current -= 1);
likesCount.current += 1;
} else {
return message.error("You already liked.");
let new_likes = {
likes: likes > 0 ? parseInt(likes) - 1 : likes,
dislikes: dislikes,
};
updateWord(id, new_likes)(firestore);
myLikes.length > 0 && deleteLikes(myLikes[0].id)(firestore);
myLikes.length > 0 && (likesCount.current -= 1);
// return message.error("You already liked.");
}
};
const handleDislike = () => {
Expand All @@ -74,13 +84,21 @@ function WordSimple(props) {
dislikes: parseInt(dislikes) + 1,
likes: likes > 0 ? parseInt(likes) - 1 : likes,
};
console.log(myDislikes, user_dislikes, new_dislikes);
if (myDislikes.length < 1) {
updateWord(id, new_dislikes)(firestore);
addDislikes(user_dislikes)(firestore);
myLikes.length > 0 && deleteLikes(myLikes[0].id)(firestore);
myLikes.length > 0 && (likesCount.current -= 1);
dislikesCount.current += 1;
} else {
return message.error("You already disliked.");
let new_dislikes = {
dislikes: dislikes > 0? parseInt(dislikes) - 1: dislikes,
likes: likes,
};
updateWord(id, new_dislikes)(firestore);
myDislikes.length > 0 && deleteDislikes(myDislikes[0].id)(firestore);
myDislikes.length > 0 && (dislikesCount.current -= 1);
// return message.error("You already disliked.");
}
};

Expand Down Expand Up @@ -219,7 +237,7 @@ function WordSimple(props) {
onClick={handleLike}
style={{ fontSize: "4vmin" }}
/>
<Text>{likes}</Text>
<Text>{ likesCount.current }</Text>
</Col>
<Col xl={1} lg={1} md={1} sm={1}>
<Divider
Expand All @@ -234,7 +252,7 @@ function WordSimple(props) {
onClick={handleDislike}
style={{ fontSize: "4vmin" }}
/>
<Text>{dislikes}</Text>
<Text>{ dislikesCount.current }</Text>
</Col>
<Col xl={0} lg={0} md={13} sm={13}></Col>
<Col xl={13} lg={13} md={24} sm={24} style={{ textAlign: "right" }}>
Expand Down