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

Feature: option to add word as word of the day #109

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

Feature: option to add word as word of the day #109

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
1 change: 1 addition & 0 deletions com-dict-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"firebase-functions": "^3.8.0",
"puppeteer": "^5.2.1",
"react": "^16.13.1",
"react-calendar": "^4.0.0",
"react-dom": "^16.13.1",
"react-instantsearch-dom": "^6.7.0",
"react-redux": "^7.2.0",
Expand Down
40 changes: 38 additions & 2 deletions com-dict-client/src/components/AddWord/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import {
message,
} from "antd";
import WordClass from "./WordClass";

import Calendar from "react-calendar";
import "react-calendar/dist/Calendar.css";
import EditableTagGroup from "./RelatedWords";

import { useFirestore, useFirestoreConnect } from "react-redux-firebase";
Expand Down Expand Up @@ -45,6 +48,13 @@ function WordForm() {
const onSubmit = (values) => {
// const definition = values;
// console.log(definition);
var dateString = null;
if (checked) {
dateString = new Date(date.getTime() - date.getTimezoneOffset() * 60000)
.toISOString()
.split("T")[0];
}

const data = {
other_language: language,
head_term: headTerm,
Expand All @@ -60,14 +70,17 @@ function WordForm() {
uname: user.displayName,
createdAt: new Date().getTime(),
alphabatical: headTerm[0].toUpperCase(),
word_of_the_day: null,
word_of_the_day: dateString,
pronunciation: null,
trending_factor: 0,
};
console.log(data);
return addWord(data)(firestore);
};

const [date, setDate] = useState(new Date());
const [checked, setChecked] = React.useState(false);

const categories = useSelector((state) => state.firestore.ordered.categories);

const headTerms = useSelector((state) => state.firestore.ordered.headTerms);
Expand All @@ -87,7 +100,9 @@ function WordForm() {
console.log(newHdTm);
addHeadTerm(newHdTm)(firestore, setHeadTerm);
};

const handleChange = () => {
setChecked(!checked);
};
return (
<div>
<Row>
Expand Down Expand Up @@ -244,6 +259,27 @@ function WordForm() {
<Row>
<Col xl={6} ls={6} md={3} sm={0} xs={0}></Col>
<Col xl={12} lg={12} md={18} sm={24} xs={24}>
<div>
<label>
<input
type="checkbox"
checked={checked}
onChange={handleChange}
/>
Word of the Day?
</label>
</div>
{checked && (
<div className="app">
<h1 className="header">Select Date</h1>
<div className="calendar-container">
<Calendar onChange={setDate} value={date} />
</div>
<div className="text-center">
Selected date: {date.toDateString()}
</div>
</div>
)}
<Button
type="primary"
// size="large"
Expand Down
2 changes: 1 addition & 1 deletion com-dict-client/src/components/WordHome/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function WordHome() {
// let lastItem = "";
const defs = [];
querySnapshot.docs.filter((doc) => {
if (doc.data().word_of_the_day) {
if (Date.parse(doc.data().word_of_the_day)<Date.parse(moment().format("YYYY-MM-DD"))) {
// lastItem = doc.id;
let tempObj = {};
tempObj = doc.data();
Expand Down