diff --git a/package.json b/package.json index 619c917..c500c53 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "firebase": "^8.5.0", "framer-motion": "^4.1.13", "moment": "^2.29.1", - "prop-types": "15.7.2", + "prop-types": "15.8.0", "react": "^17.0.2", "react-dom": "^17.0.2", "react-firebaseui": "^5.0.2", diff --git a/src/App.js b/src/App.js index 8546747..11adbf8 100644 --- a/src/App.js +++ b/src/App.js @@ -9,22 +9,24 @@ import { Login } from "./pages/Login"; import { Application } from "./pages/Application"; import theme from "./theme"; -export const App = () => ( - <> - - - - - - - - - - - - - - - - -); +export var App = function () { + return ( + <> + + + + + + + + + + + + + + + + + ); +}; diff --git a/src/__tests__/App.spec.js b/src/__tests__/App.spec.js index 6085da8..bebb61c 100644 --- a/src/__tests__/App.spec.js +++ b/src/__tests__/App.spec.js @@ -16,8 +16,8 @@ jest.mock("../firebase", () => ({ ), })), where: jest.fn(() => ({ - onSnapshot: jest.fn(() => () => - Promise.resolve("Never mock firebase") + onSnapshot: jest.fn( + () => () => Promise.resolve("Never mock firebase") ), })), })), diff --git a/src/__tests__/Tasks.spec.js b/src/__tests__/Tasks.spec.js index 998e17d..a9bf1a2 100644 --- a/src/__tests__/Tasks.spec.js +++ b/src/__tests__/Tasks.spec.js @@ -49,8 +49,7 @@ jest.mock("../hooks", () => ({ archived: false, date: "21/07/2019", projectId: "1", - task: - "Would I rather be feared or loved? Easy. Both. I want people to be afraid of how much they love me.", + task: "Would I rather be feared or loved? Easy. Both. I want people to be afraid of how much they love me.", userId: "jlIFXIwyAL3tzHMtzRbw", }, ], diff --git a/src/components/AddProject.js b/src/components/AddProject.js index 7a6d0f6..2efb1f0 100644 --- a/src/components/AddProject.js +++ b/src/components/AddProject.js @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import { SmallAddIcon } from "@chakra-ui/icons"; import { useFirestore } from "react-redux-firebase"; -export const AddProject = () => { +export var AddProject = function () { const [show, setShow] = useState(false); const [projectName, setProjectName] = useState(""); diff --git a/src/components/AddTask.js b/src/components/AddTask.js index 1a55b72..aa88f67 100644 --- a/src/components/AddTask.js +++ b/src/components/AddTask.js @@ -8,7 +8,7 @@ import { Box, Flex, Input, Button } from "@chakra-ui/react"; import { SmallAddIcon } from "@chakra-ui/icons"; import { useSelectedProjectValue } from "../context"; -export const AddTask = () => { +export var AddTask = function () { const [taskName, setTaskName] = useState(""); const [showMain, setShowMain] = useState(false); diff --git a/src/components/Project.js b/src/components/Project.js index 9f4e682..25736ab 100644 --- a/src/components/Project.js +++ b/src/components/Project.js @@ -17,7 +17,7 @@ import { useSelectedProjectValue } from "../context"; import { CircleIcon } from "./icons"; import { getRandomColor } from "../helpers"; -export const Project = ({ project }) => { +export var Project = function ({ project }) { const [showIcon, setShowIcon] = useState(false); const { selectedProject, setSelectedProject } = useSelectedProjectValue(); const { colorMode } = useColorMode(); diff --git a/src/components/Projects.js b/src/components/Projects.js index 590d014..a5db99d 100644 --- a/src/components/Projects.js +++ b/src/components/Projects.js @@ -4,7 +4,7 @@ import { useFirestoreConnect } from "react-redux-firebase"; import { Text } from "@chakra-ui/react"; import { Project } from "./Project"; -export const Projects = () => { +export var Projects = function () { const auth = useSelector((state) => state.firebase.auth); useFirestoreConnect([ diff --git a/src/components/Tasks.js b/src/components/Tasks.js index f49c15f..e3f3b26 100644 --- a/src/components/Tasks.js +++ b/src/components/Tasks.js @@ -6,7 +6,7 @@ import { AddTask } from "./AddTask"; import { useSelectedProjectValue } from "../context"; import { staticProjects } from "../constants"; -export const Tasks = () => { +export var Tasks = function () { const { selectedProject } = useSelectedProjectValue(); const firestore = useFirestore(); const auth = useSelector((state) => state.firebase.auth); diff --git a/src/components/hocs/PrivateRoute.js b/src/components/hocs/PrivateRoute.js index 7fafc3e..6e8b3eb 100644 --- a/src/components/hocs/PrivateRoute.js +++ b/src/components/hocs/PrivateRoute.js @@ -4,7 +4,7 @@ import { useSelector } from "react-redux"; import { isLoaded, isEmpty } from "react-redux-firebase"; import PropTypes from "prop-types"; -export const PrivateRoute = ({ children, path }) => { +export var PrivateRoute = function ({ children, path }) { const auth = useSelector((state) => state.firebase.auth); return ( diff --git a/src/components/icons/CircleIcon.js b/src/components/icons/CircleIcon.js index 94a286e..71f6d98 100644 --- a/src/components/icons/CircleIcon.js +++ b/src/components/icons/CircleIcon.js @@ -2,14 +2,16 @@ import React from "react"; import PropTypes from "prop-types"; import { Icon } from "@chakra-ui/react"; -export const CircleIcon = ({ boxSize, color }) => ( - - - -); +export var CircleIcon = function ({ boxSize, color }) { + return ( + + + + ); +}; CircleIcon.propTypes = { boxSize: PropTypes.number.isRequired, diff --git a/src/components/layout/Content.js b/src/components/layout/Content.js index a6b3915..cefb4c1 100644 --- a/src/components/layout/Content.js +++ b/src/components/layout/Content.js @@ -3,13 +3,15 @@ import { Grid, GridItem } from "@chakra-ui/react"; import { Sidebar } from "./Sidebar"; import { Tasks } from "../Tasks"; -export const Content = () => ( - - - - - - - - -); +export var Content = function () { + return ( + + + + + + + + + ); +}; diff --git a/src/components/layout/Header.js b/src/components/layout/Header.js index a006652..19ef010 100644 --- a/src/components/layout/Header.js +++ b/src/components/layout/Header.js @@ -11,7 +11,7 @@ import { import { AddIcon, MoonIcon, SunIcon } from "@chakra-ui/icons"; import AddQuickTask from "../AddQuickTask"; -export const Header = () => { +export var Header = function () { const { onOpen, onClose, isOpen } = useDisclosure(); const { colorMode, toggleColorMode } = useColorMode(); diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js index 6eda84c..c9e0887 100644 --- a/src/components/layout/Sidebar.js +++ b/src/components/layout/Sidebar.js @@ -18,7 +18,7 @@ import { useSelectedProjectValue } from "../../context"; import { AddProject } from "../AddProject"; import { staticProjects } from "../../constants"; -export const Sidebar = () => { +export var Sidebar = function () { const { selectedProject, setSelectedProject } = useSelectedProjectValue(); return ( diff --git a/src/context/selected-project-context.js b/src/context/selected-project-context.js index da821d9..7adce4c 100644 --- a/src/context/selected-project-context.js +++ b/src/context/selected-project-context.js @@ -3,7 +3,7 @@ import PropTypes from "prop-types"; export const SelectedProjectContext = createContext(); -export const SelectedProjectProvider = ({ children }) => { +export var SelectedProjectProvider = function ({ children }) { const [selectedProject, setSelectedProject] = useState("inbox"); return ( diff --git a/src/pages/Application.js b/src/pages/Application.js index 95e654f..bcdf231 100644 --- a/src/pages/Application.js +++ b/src/pages/Application.js @@ -4,13 +4,15 @@ import { Header } from "../components/layout/Header"; import { Content } from "../components/layout/Content"; import { SelectedProjectProvider } from "../context"; -export const Application = () => ( - - -
-
- -
-
-
-); +export var Application = function () { + return ( + + +
+
+ +
+
+
+ ); +}; diff --git a/src/pages/Login.js b/src/pages/Login.js index 8a67e1d..64b9126 100644 --- a/src/pages/Login.js +++ b/src/pages/Login.js @@ -3,7 +3,7 @@ import { useFirebase } from "react-redux-firebase"; import { useHistory } from "react-router-dom"; import StyledFirebaseAuth from "react-firebaseui/StyledFirebaseAuth"; -export const Login = () => { +export var Login = function () { const firebase = useFirebase(); const history = useHistory(); diff --git a/yarn.lock b/yarn.lock index 5ec0023..d0f89c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10253,14 +10253,14 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -prop-types@15.7.2, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== +prop-types@15.8.0, prop-types@^15.6.2, prop-types@^15.7.2: + version "15.8.0" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.0.tgz#d237e624c45a9846e469f5f31117f970017ff588" + integrity sha512-fDGekdaHh65eI3lMi5OnErU6a8Ighg2KjcjQxO7m8VHyWjcPyj5kiOgV1LQDOOOgVy3+5FgjXvdSSX7B8/5/4g== dependencies: loose-envify "^1.4.0" object-assign "^4.1.1" - react-is "^16.8.1" + react-is "^16.13.1" protobufjs@^6.8.6: version "6.11.2" @@ -10528,7 +10528,7 @@ react-icons@^4.2.0: resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.2.0.tgz#6dda80c8a8f338ff96a1851424d63083282630d0" integrity sha512-rmzEDFt+AVXRzD7zDE21gcxyBizD/3NqjbX6cmViAgdqfJ2UiLer8927/QhhrXQV7dEj/1EGuOTPp7JnLYVJKQ== -react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1: +react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==