diff --git a/backend/package-lock.json b/backend/package-lock.json
index 4246bb5..daf3beb 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "widy-backend",
- "version": "0.9.1",
+ "version": "0.9.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -302,9 +302,9 @@
}
},
"@types/node": {
- "version": "13.9.2",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.2.tgz",
- "integrity": "sha512-bnoqK579sAYrQbp73wwglccjJ4sfRdKU7WNEZ5FW4K2U6Kc0/eZ5kvXG0JKsEKFB50zrFmfFt52/cvBbZa7eXg=="
+ "version": "13.9.3",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
+ "integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA=="
},
"@types/range-parser": {
"version": "1.2.3",
@@ -321,45 +321,56 @@
}
},
"@typescript-eslint/eslint-plugin": {
- "version": "2.24.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz",
- "integrity": "sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA==",
+ "version": "2.25.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.25.0.tgz",
+ "integrity": "sha512-W2YyMtjmlrOjtXc+FtTelVs9OhuR6OlYc4XKIslJ8PUJOqgYYAPRJhAqkYRQo3G4sjvG8jSodsNycEn4W2gHUw==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "2.24.0",
- "eslint-utils": "^1.4.3",
+ "@typescript-eslint/experimental-utils": "2.25.0",
"functional-red-black-tree": "^1.0.1",
"regexpp": "^3.0.0",
"tsutils": "^3.17.1"
}
},
"@typescript-eslint/experimental-utils": {
- "version": "2.24.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz",
- "integrity": "sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw==",
+ "version": "2.25.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz",
+ "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.3",
- "@typescript-eslint/typescript-estree": "2.24.0",
- "eslint-scope": "^5.0.0"
+ "@typescript-eslint/typescript-estree": "2.25.0",
+ "eslint-scope": "^5.0.0",
+ "eslint-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "eslint-utils": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+ "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+ "dev": true,
+ "requires": {
+ "eslint-visitor-keys": "^1.1.0"
+ }
+ }
}
},
"@typescript-eslint/parser": {
- "version": "2.24.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.24.0.tgz",
- "integrity": "sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw==",
+ "version": "2.25.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.25.0.tgz",
+ "integrity": "sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg==",
"dev": true,
"requires": {
"@types/eslint-visitor-keys": "^1.0.0",
- "@typescript-eslint/experimental-utils": "2.24.0",
- "@typescript-eslint/typescript-estree": "2.24.0",
+ "@typescript-eslint/experimental-utils": "2.25.0",
+ "@typescript-eslint/typescript-estree": "2.25.0",
"eslint-visitor-keys": "^1.1.0"
}
},
"@typescript-eslint/typescript-estree": {
- "version": "2.24.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz",
- "integrity": "sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA==",
+ "version": "2.25.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz",
+ "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==",
"dev": true,
"requires": {
"debug": "^4.1.1",
@@ -2076,9 +2087,9 @@
}
},
"eslint-config-prettier": {
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz",
- "integrity": "sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg==",
+ "version": "6.10.1",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz",
+ "integrity": "sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ==",
"dev": true,
"requires": {
"get-stdin": "^6.0.0"
@@ -4334,9 +4345,9 @@
"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
},
"prettier": {
- "version": "1.19.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
- "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.1.tgz",
+ "integrity": "sha512-piXGBcY1zoFOG0MvHpNE5reAGseLmaCRifQ/fmfF49BcYkInEs/naD/unxGNAeOKFA5+JxVrPyMvMlpzcd20UA==",
"dev": true
},
"prettier-linter-helpers": {
@@ -5275,9 +5286,9 @@
"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="
},
"ts-node": {
- "version": "8.7.0",
- "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz",
- "integrity": "sha512-s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg==",
+ "version": "8.8.1",
+ "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz",
+ "integrity": "sha512-10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg==",
"dev": true,
"requires": {
"arg": "^4.1.0",
diff --git a/backend/package.json b/backend/package.json
index e1c9b51..44a5e51 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "widy-backend",
- "version": "0.9.2",
+ "version": "0.9.3",
"description": "Widy app backend",
"main": "build/index.js",
"repository": {
@@ -55,16 +55,16 @@
"@types/jsonwebtoken": "^8.3.8",
"@types/lodash": "^4.14.149",
"@types/mongoose": "^5.7.7",
- "@types/node": "^13.9.2",
- "@typescript-eslint/eslint-plugin": "^2.24.0",
- "@typescript-eslint/parser": "^2.24.0",
+ "@types/node": "^13.9.3",
+ "@typescript-eslint/eslint-plugin": "^2.25.0",
+ "@typescript-eslint/parser": "^2.25.0",
"eslint": "^6.8.0",
"eslint-config-node": "^4.0.0",
- "eslint-config-prettier": "^6.10.0",
+ "eslint-config-prettier": "^6.10.1",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-prettier": "^3.1.2",
- "prettier": "^1.19.1",
- "ts-node": "^8.7.0",
+ "prettier": "^2.0.1",
+ "ts-node": "^8.8.1",
"typescript": "^3.8.3"
}
}
diff --git a/backend/src/controllers/days/getDays.ts b/backend/src/controllers/days/getDays.ts
index 6c3ae53..b0c45c4 100644
--- a/backend/src/controllers/days/getDays.ts
+++ b/backend/src/controllers/days/getDays.ts
@@ -22,6 +22,7 @@ export const getDays = async (req: Request, res: Response) => {
const page = req.query.page || 1;
const options = {
+ select: 'day',
page,
sort: { day: 'desc' },
limit: MAX_DAYS,
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9c58a88..162b5c4 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "widy-frontend",
- "version": "0.9.1",
+ "version": "0.9.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -1469,50 +1469,21 @@
}
},
"@binarycapsule/ui-capsules": {
- "version": "1.10.2",
- "resolved": "https://registry.npmjs.org/@binarycapsule/ui-capsules/-/ui-capsules-1.10.2.tgz",
- "integrity": "sha512-znJ7QvTAmt6GraZ2jHWf8ItStZLmI1edmqgWYdltGqayrN6ACGOpsx3X/NOo19Vljmr/iwlZjCSrepg4ztiTaw==",
+ "version": "1.10.3",
+ "resolved": "https://registry.npmjs.org/@binarycapsule/ui-capsules/-/ui-capsules-1.10.3.tgz",
+ "integrity": "sha512-DKJNjvHnAa6fLD/9PgX+k6Kmkpzb7Ev7HLobn7fV1BrFOr5ccK1eiCRtkpZll6c6gnq6JLTku2QSReYGu4P1WA==",
"requires": {
- "downshift": "^3.4.8",
+ "downshift": "^5.0.5",
"focus-visible": "^5.0.2",
- "jest-styled-components": "^6.3.4",
+ "jest-styled-components": "^7.0.0",
"prop-types": "^15.7.2",
"react-copy-to-clipboard": "^5.0.2",
- "react-modal": "^3.11.1",
+ "react-modal": "^3.11.2",
+ "react-popper": "^1.3.7",
"react-popper-tooltip": "^2.10.1",
"react-select": "^3.0.8",
"react-toast-notifications": "^2.4.0",
- "styled-components": "^4.4.1"
- },
- "dependencies": {
- "jest-styled-components": {
- "version": "6.3.4",
- "resolved": "https://registry.npmjs.org/jest-styled-components/-/jest-styled-components-6.3.4.tgz",
- "integrity": "sha512-dc32l0/6n3FtsILODpvKNz6SLg50OmbJ/3r3oRh9jc2VIPPGZT5jWv7BKIcNCYH7E38ZK7uejNl3zJsCOIenng==",
- "requires": {
- "css": "^2.2.4"
- }
- },
- "styled-components": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-4.4.1.tgz",
- "integrity": "sha512-RNqj14kYzw++6Sr38n7197xG33ipEOktGElty4I70IKzQF1jzaD1U4xQ+Ny/i03UUhHlC5NWEO+d8olRCDji6g==",
- "requires": {
- "@babel/helper-module-imports": "^7.0.0",
- "@babel/traverse": "^7.0.0",
- "@emotion/is-prop-valid": "^0.8.1",
- "@emotion/unitless": "^0.7.0",
- "babel-plugin-styled-components": ">= 1",
- "css-to-react-native": "^2.2.2",
- "memoize-one": "^5.0.0",
- "merge-anything": "^2.2.4",
- "prop-types": "^15.5.4",
- "react-is": "^16.6.0",
- "stylis": "^3.5.0",
- "stylis-rule-sheet": "^0.0.10",
- "supports-color": "^5.5.0"
- }
- }
+ "styled-components": "^5.0.1"
}
},
"@cnakazawa/watch": {
@@ -1535,9 +1506,9 @@
"integrity": "sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg=="
},
"@emotion/cache": {
- "version": "10.0.27",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.27.tgz",
- "integrity": "sha512-Zp8BEpbMunFsTcqAK4D7YTm3MvCp1SekflSLJH8lze2fCcSZ/yMkXHo8kb3t1/1Tdd3hAqf3Fb7z9VZ+FMiC9w==",
+ "version": "10.0.29",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
+ "integrity": "sha512-fU2VtSVlHiF27empSbxi1O2JFdNWZO+2NFHfwO0pxgTep6Xa3uGb+3pVKfLww2l/IBGLNEZl5Xf/++A4wAYDYQ==",
"requires": {
"@emotion/sheet": "0.9.4",
"@emotion/stylis": "0.8.5",
@@ -1546,9 +1517,9 @@
}
},
"@emotion/core": {
- "version": "10.0.27",
- "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.27.tgz",
- "integrity": "sha512-XbD5R36pVbohQMnKfajHv43g8EbN4NHdF6Zh9zg/C0nr0jqwOw3gYnC07Xj3yG43OYSRyrGsoQ5qPwc8ycvLZw==",
+ "version": "10.0.28",
+ "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.0.28.tgz",
+ "integrity": "sha512-pH8UueKYO5jgg0Iq+AmCLxBsvuGtvlmiDCOuv8fGNYn3cowFpLN98L8zO56U0H1PjDIyAlXymgL3Wu7u7v6hbA==",
"requires": {
"@babel/runtime": "^7.5.5",
"@emotion/cache": "^10.0.27",
@@ -1569,9 +1540,9 @@
}
},
"@emotion/hash": {
- "version": "0.7.4",
- "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.7.4.tgz",
- "integrity": "sha512-fxfMSBMX3tlIbKUdtGKxqB1fyrH6gVrX39Gsv3y8lRYKUqlgDt3UMqQyGnR1bQMa2B8aGnhLZokZgg8vT0Le+A=="
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
},
"@emotion/is-prop-valid": {
"version": "0.8.6",
@@ -1587,11 +1558,11 @@
"integrity": "sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="
},
"@emotion/serialize": {
- "version": "0.11.15",
- "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.15.tgz",
- "integrity": "sha512-YE+qnrmGwyR+XB5j7Bi+0GT1JWsdcjM/d4POu+TXkcnrRs4RFCCsi3d/Ebf+wSStHqAlTT2+dfd+b9N9EO2KBg==",
+ "version": "0.11.16",
+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.11.16.tgz",
+ "integrity": "sha512-G3J4o8by0VRrO+PFeSc3js2myYNOXVJ3Ya+RGVxnshRYgsvErfAOglKAiy1Eo1vhzxqtUvjCyS5gtewzkmvSSg==",
"requires": {
- "@emotion/hash": "0.7.4",
+ "@emotion/hash": "0.8.0",
"@emotion/memoize": "0.7.4",
"@emotion/unitless": "0.7.5",
"@emotion/utils": "0.11.3",
@@ -3243,14 +3214,14 @@
}
},
"babel-plugin-emotion": {
- "version": "10.0.27",
- "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.27.tgz",
- "integrity": "sha512-SUNYcT4FqhOqvwv0z1oeYhqgheU8qrceLojuHyX17ngo7WtWqN5I9l3IGHzf21Xraj465CVzF4IvOlAF+3ed0A==",
+ "version": "10.0.29",
+ "resolved": "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-10.0.29.tgz",
+ "integrity": "sha512-7Jpi1OCxjyz0k163lKtqP+LHMg5z3S6A7vMBfHnF06l2unmtsOmFDzZBpGf0CWo1G4m8UACfVcDJiSiRuu/cSw==",
"requires": {
"@babel/helper-module-imports": "^7.0.0",
- "@emotion/hash": "0.7.4",
+ "@emotion/hash": "0.8.0",
"@emotion/memoize": "0.7.4",
- "@emotion/serialize": "^0.11.15",
+ "@emotion/serialize": "^0.11.16",
"babel-plugin-macros": "^2.0.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"convert-source-map": "^1.5.0",
@@ -4681,16 +4652,6 @@
"resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
"integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="
},
- "css-to-react-native": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz",
- "integrity": "sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==",
- "requires": {
- "camelize": "^1.0.0",
- "css-color-keywords": "^1.0.0",
- "postcss-value-parser": "^3.3.0"
- }
- },
"css-tree": {
"version": "1.0.0-alpha.37",
"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
@@ -5358,9 +5319,9 @@
"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
},
"downshift": {
- "version": "3.4.8",
- "resolved": "https://registry.npmjs.org/downshift/-/downshift-3.4.8.tgz",
- "integrity": "sha512-dZL3iNL/LbpHNzUQAaVq/eTD1ocnGKKjbAl/848Q0KEp6t81LJbS37w3f93oD6gqqAnjdgM7Use36qZSipHXBw==",
+ "version": "5.0.5",
+ "resolved": "https://registry.npmjs.org/downshift/-/downshift-5.0.5.tgz",
+ "integrity": "sha512-V1idov3Rkvz1YWA1K67aIx51EgokIDvep4x6KmU7HhsayI8DvTEZBeH4O92zeFVGximKujRO7ChBzBAf4PKWFA==",
"requires": {
"@babel/runtime": "^7.4.5",
"compute-scroll-into-view": "^1.0.9",
@@ -5724,9 +5685,9 @@
}
},
"eslint-config-prettier": {
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz",
- "integrity": "sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg==",
+ "version": "6.10.1",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz",
+ "integrity": "sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ==",
"dev": true,
"requires": {
"get-stdin": "^6.0.0"
@@ -8252,11 +8213,6 @@
"resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
"integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
},
- "is-what": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.6.0.tgz",
- "integrity": "sha512-2rMAWmuDACWgcy5Cp4eDXHRf4GlNjXKp3e/0etFzE5HZhCgPw8u5zeKDyLIUmtE2GP9mGK3jS7jvXYFc6qk/ZA=="
- },
"is-window": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-window/-/is-window-1.0.2.tgz",
@@ -10422,14 +10378,6 @@
}
}
},
- "merge-anything": {
- "version": "2.4.4",
- "resolved": "https://registry.npmjs.org/merge-anything/-/merge-anything-2.4.4.tgz",
- "integrity": "sha512-l5XlriUDJKQT12bH+rVhAHjwIuXWdAIecGwsYjv2LJo+dA1AeRTmeQS+3QBpO6lEthBMDi2IUMpLC1yyRvGlwQ==",
- "requires": {
- "is-what": "^3.3.1"
- }
- },
"merge-deep": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
@@ -12639,9 +12587,9 @@
"integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
},
"prettier": {
- "version": "1.19.1",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
- "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.1.tgz",
+ "integrity": "sha512-piXGBcY1zoFOG0MvHpNE5reAGseLmaCRifQ/fmfF49BcYkInEs/naD/unxGNAeOKFA5+JxVrPyMvMlpzcd20UA==",
"dev": true
},
"prettier-linter-helpers": {
@@ -13363,9 +13311,9 @@
}
},
"react-modal": {
- "version": "3.11.1",
- "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.11.1.tgz",
- "integrity": "sha512-8uN744Yq0X2lbfSLxsEEc2UV3RjSRb4yDVxRQ1aGzPo86QjNOwhQSukDb8U8kR+636TRTvfMren10fgOjAy9eA==",
+ "version": "3.11.2",
+ "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.11.2.tgz",
+ "integrity": "sha512-o8gvvCOFaG1T7W6JUvsYjRjMVToLZgLIsi5kdhFIQCtHxDkA47LznX62j+l6YQkpXDbvQegsDyxe/+JJsFQN7w==",
"requires": {
"exenv": "^1.2.0",
"prop-types": "^15.5.10",
@@ -13414,12 +13362,17 @@
},
"dependencies": {
"@babel/runtime": {
- "version": "7.8.4",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
- "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+ "version": "7.9.2",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+ "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
"requires": {
- "regenerator-runtime": "^0.13.2"
+ "regenerator-runtime": "^0.13.4"
}
+ },
+ "regenerator-runtime": {
+ "version": "0.13.5",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+ "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
}
}
},
@@ -13683,11 +13636,11 @@
},
"dependencies": {
"@babel/runtime": {
- "version": "7.8.4",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
- "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+ "version": "7.9.2",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+ "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
"requires": {
- "regenerator-runtime": "^0.13.2"
+ "regenerator-runtime": "^0.13.4"
}
}
}
@@ -13702,6 +13655,11 @@
"loose-envify": "^1.4.0",
"prop-types": "^15.6.2"
}
+ },
+ "regenerator-runtime": {
+ "version": "0.13.5",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+ "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
}
}
},
@@ -15606,16 +15564,6 @@
}
}
},
- "stylis": {
- "version": "3.5.4",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz",
- "integrity": "sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="
- },
- "stylis-rule-sheet": {
- "version": "0.0.10",
- "resolved": "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz",
- "integrity": "sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="
- },
"supports-color": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index c82fc5c..3d30cd3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "widy-frontend",
- "version": "0.9.2",
+ "version": "0.9.3",
"private": true,
"proxy": "http://localhost:5000",
"scripts": {
@@ -20,7 +20,7 @@
],
"dependencies": {
"@binarycapsule/editor": "^1.1.1",
- "@binarycapsule/ui-capsules": "^1.10.2",
+ "@binarycapsule/ui-capsules": "^1.10.3",
"@nivo/pie": "^0.61.1",
"axios": "^0.19.2",
"focus-visible": "^5.0.2",
@@ -59,7 +59,7 @@
"@types/styled-components": "^5.0.1",
"babel-plugin-macros": "^2.8.0",
"eslint-config-airbnb": "^18.1.0",
- "eslint-config-prettier": "^6.10.0",
+ "eslint-config-prettier": "^6.10.1",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-jest": "^23.8.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
@@ -67,7 +67,7 @@
"eslint-plugin-react": "^7.19.0",
"husky": "^4.2.3",
"lint-staged": "^10.0.8",
- "prettier": "^1.19.1",
+ "prettier": "^2.0.1",
"pretty-quick": "^2.0.1"
},
"husky": {
diff --git a/frontend/src/components/day/Board/Task/Task.jsx b/frontend/src/components/day/Board/Task/Task.jsx
index 6de7486..69beb4b 100644
--- a/frontend/src/components/day/Board/Task/Task.jsx
+++ b/frontend/src/components/day/Board/Task/Task.jsx
@@ -38,11 +38,6 @@ const Task = ({
onChange={() => handleTaskCompletedStateChange(isActive, isCompleted, taskId, sectionId)}
/>
handleTaskRename()}>{children}
- {/*
-
-
-
- */}
{!isCompleted && (
diff --git a/frontend/src/components/day/Board/Task/Task.styles.js b/frontend/src/components/day/Board/Task/Task.styles.js
index 9904af6..06d16e7 100644
--- a/frontend/src/components/day/Board/Task/Task.styles.js
+++ b/frontend/src/components/day/Board/Task/Task.styles.js
@@ -1,4 +1,4 @@
-import styled, { keyframes } from 'styled-components/macro';
+import styled, { css } from 'styled-components/macro';
const getColors = props => {
const colors = {
@@ -27,39 +27,19 @@ const getColors = props => {
return colors;
};
-const pulseAnimationIsActive = props => keyframes`
- from {
- border-color: ${props.theme.yellow100};
- box-shadow: 0 0 0 4px ${props.theme.yellow050};
- }
-
- to {
- border-color: ${props.theme.yellow700};
- box-shadow: 0 0 0 4px ${props.theme.yellow200};
- }
+export const StyledCopyButton = styled.div`
+ display: none;
+ height: 24px;
`;
-const pulseAnimationInBreak = props => keyframes`
- from {
- border-color: ${props.theme.blue050};
- box-shadow: 0 0 0 4px ${props.theme.blue050};
- }
-
- to {
- border-color: ${props.theme.blue400};
- box-shadow: 0 0 0 4px ${props.theme.blue100};
- }
+const isActiveMixin = css`
+ border-color: ${({ theme }) => theme.yellow700};
+ box-shadow: 0 0 0 4px ${({ theme }) => theme.yellow200};
`;
-const getAnimation = props => {
- if (props.isInBreak) return pulseAnimationInBreak(props);
- if (props.isActive) return pulseAnimationIsActive(props);
- return null;
-};
-
-export const StyledCopyButton = styled.div`
- display: none;
- height: 24px;
+const isInBreakMixin = css`
+ border-color: ${({ theme }) => theme.blue400};
+ box-shadow: 0 0 0 4px ${({ theme }) => theme.blue100};
`;
export const StyledTask = styled.div`
@@ -74,10 +54,8 @@ export const StyledTask = styled.div`
margin: 4px 0;
color: ${props => (props.isCompleted ? props.theme.neutral300 : props.theme.neutral700)};
cursor: pointer;
- animation: ${props => getAnimation(props)};
- animation-duration: 1s;
- animation-iteration-count: infinite;
- animation-direction: alternate;
+ ${({ isActive }) => isActive && isActiveMixin};
+ ${({ isInBreak }) => isInBreak && isInBreakMixin};
&:hover {
background-color: ${props =>
diff --git a/package.json b/package.json
index 051af59..04f4602 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "widy",
- "version": "0.9.2",
+ "version": "0.9.3",
"description": "Widy - What I did yesterday",
"repository": {
"type": "git",