diff --git a/src/App.js b/src/App.js
index 2a0cf31..3212e41 100644
--- a/src/App.js
+++ b/src/App.js
@@ -26,6 +26,11 @@ function App() {
const [signIn, setSignIn] = useState('')
+ const [apiKey, setApiKey] = useState('')
+
+ const [workspaceID, setWorspaceID] = useState(0)
+ const [projectID, setProjectID] = useState(0)
+
const auth = getAuth()
onAuthStateChanged(auth, (user) => {
@@ -63,10 +68,28 @@ function App() {
signIn={signIn}
timerOn={timerOn}
setTimerOn={setTimerOn}
+
+ workspaceID={workspaceID}
+ setWorspaceID={setWorspaceID}
+
+ projectID={projectID}
+ setProjectID={setProjectID}
+
+ apiKey={apiKey}
/>
+
diff --git a/src/components/ClockifyTasksDisplay.jsx b/src/components/ClockifyTasksDisplay.jsx
index e5c4af4..d230136 100644
--- a/src/components/ClockifyTasksDisplay.jsx
+++ b/src/components/ClockifyTasksDisplay.jsx
@@ -10,7 +10,6 @@ const ClockifyTasksDisplay = (props) => {
const auth = getAuth()
const [userUID, setUserUID] = useState('')
- const [apiKey, setApiKey] = useState('')
const [workspaces, setWorkspaces] = useState([])
const [workspacesReady, setWorkspacesReady] = useState(false)
@@ -18,9 +17,6 @@ const ClockifyTasksDisplay = (props) => {
const [projects, setProjects] = useState([])
const [projectsDone, setProjectsDone] = useState(false)
- const [workspaceID, setWorspaceID] = useState(0)
- const [projectID, setProjectID] = useState(0)
-
const [loading, setLoading] = useState(true)
const getApiKey = async () => {
@@ -61,7 +57,7 @@ const ClockifyTasksDisplay = (props) => {
const response = await fetch(`https://api.clockify.me/api/v1/workspaces/`, request)
const data = await response.json()
- setApiKey(apiClockify)
+ props.setApiKey(apiClockify)
return await data
@@ -74,7 +70,7 @@ const ClockifyTasksDisplay = (props) => {
const getApiKeyReturn = key
- console.log(apiKey)
+ console.log(props.apiKey)
const data = await makeRequestWorkspaces(key)
@@ -125,7 +121,7 @@ const ClockifyTasksDisplay = (props) => {
const request = {
method: "GET",
headers: {
- 'X-Api-Key': apiKey,
+ 'X-Api-Key': props.apiKey,
"content-type": "application/json"
}
}
@@ -151,7 +147,7 @@ const ClockifyTasksDisplay = (props) => {
setProjectsDone(true)
}
- setWorspaceID(e)
+ props.setWorspaceID(e)
const data = await makeRequestProjects(e)
@@ -165,6 +161,11 @@ const ClockifyTasksDisplay = (props) => {
}
+ const selectProject = (e) => {
+
+ props.setProjectID(e)
+ }
+
if (loading) {
return (
@@ -186,7 +187,8 @@ const ClockifyTasksDisplay = (props) => {
: null
}
-