Skip to content

Commit 794f501

Browse files
committed
i think i started learning backend
1 parent 331f84c commit 794f501

File tree

9 files changed

+130
-89
lines changed

9 files changed

+130
-89
lines changed

package-lock.json

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"@testing-library/jest-dom": "^5.16.4",
77
"@testing-library/react": "^13.3.0",
88
"@testing-library/user-event": "^13.5.0",
9+
"axios": "^0.27.2",
910
"react": "^18.2.0",
1011
"react-dom": "^18.2.0",
1112
"react-scripts": "5.0.1",

public/css/theme.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import url("https://fonts.googleapis.com/css2?family=Manrope:wght@200;300;400;500;600;700;800&display=swap");
1+
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@200;300;400;500;600;700;800&display=swap");
22
* {
33
font-family: Poppins;
44
transition: 0.3s ease;

src/components/Main.jsx

Lines changed: 5 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -6,90 +6,20 @@ import Tally from "./bases/Tally";
66
import Expenses from "./bases/Expenses";
77
import Mood from "./bases/Mood";
88

9-
function Main() {
10-
const [moods] = React.useState([
11-
{ id: 1, mood: "IDK", date: "01-01-2020" },
12-
{ id: 2, mood: "Sed Lyf", date: "02-01-2020" },
13-
]);
14-
const [expenses] = React.useState([
15-
{
16-
id: 1,
17-
name: "Rent",
18-
amount: 1000,
19-
category: "monthly",
20-
date: "01-01-2020",
21-
},
22-
{
23-
id: 2,
24-
name: "Milk",
25-
amount: 100,
26-
category: "daily",
27-
date: "01-02-2020",
28-
},
29-
{
30-
id: 3,
31-
name: "Lambo",
32-
amount: 10,
33-
category: "daily",
34-
date: "01-01-2020",
35-
},
36-
{
37-
id: 4,
38-
name: "Bread",
39-
amount: 10000,
40-
category: "daily",
41-
date: "01-02-2020",
42-
},
43-
]);
44-
const [tallies] = React.useState([
45-
{ id: 1, category: "home", val: 1, name: "Tally 1" },
46-
{ id: 2, category: "other", val: 5, name: "Tally 2" },
47-
{ id: 3, category: "work", val: 10, name: "Tally 3" },
48-
]);
49-
const [tasks] = React.useState([
50-
{
51-
id: 1,
52-
category: "work",
53-
name: "Open the Fridge.",
54-
done: false,
55-
subTasks: [
56-
{ id: 1, name: "Touch the door.", done: false },
57-
{ id: 2, name: "Hold it.", done: false },
58-
],
59-
},
60-
{
61-
id: 2,
62-
category: "work",
63-
name: "Pick some food.",
64-
done: false,
65-
subTasks: [
66-
{ id: 1, name: "Touch the door.", done: false },
67-
{ id: 2, name: "Hold it.", done: false },
68-
],
69-
},
70-
{
71-
id: 3,
72-
category: "home",
73-
name: "Eat it.",
74-
done: false,
75-
subTasks: [],
76-
},
77-
]);
9+
export default function Main() {
7810
return (
7911
<div className="main">
80-
<Mood moods={moods} />
12+
<Mood />
8113
<hr />
82-
<Expenses expenses={expenses} />
14+
<Expenses />
8315
<hr />
8416
<Timer h={0} m={30} s={0} />
8517
<hr />
86-
<Tally tallies={tallies} />
18+
<Tally />
8719
<hr />
88-
<Tasks tasks={tasks} />
20+
<Tasks />
8921
<hr />
9022
<LeaveScreen />
9123
</div>
9224
);
9325
}
94-
95-
export default Main;

src/components/bases/Expenses.jsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
1-
import React from "react";
1+
import React, { useEffect } from "react";
2+
const axios = require("axios");
23

3-
export default function Expenses(props) {
4+
export default function Expenses() {
45
const [symbol, setSymbol] = React.useState("$");
5-
const [expenses, setExpenses] = React.useState(props.expenses);
6+
const [expenses, setExpenses] = React.useState([]);
67
const [dates, setDates] = React.useState(["01-01-2020", "01-02-2020"]);
8+
useEffect(() => {
9+
axios
10+
.get("http://localhost:3001/expenses")
11+
.then((response) => {
12+
setExpenses(response.data);
13+
})
14+
.catch((err) => {
15+
console.log("error");
16+
});
17+
}, []);
718
const addExpense = (e) => {
819
if (
920
e.key === "Enter" &&

src/components/bases/Mood.jsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import React from "react";
1+
import React, { useEffect } from "react";
2+
import axios from "axios";
23

3-
export default function Mood(props) {
4-
const [moods, setMoods] = React.useState(props.moods);
4+
export default function Mood() {
5+
const [moods, setMoods] = React.useState([]);
56
const [dates, setDates] = React.useState(["01-01-2020", "02-01-2020"]);
7+
useEffect(() => {
8+
axios
9+
.get("http://localhost:3001/moods")
10+
.then((response) => {
11+
setMoods(response.data);
12+
})
13+
.catch((err) => {
14+
console.log("error");
15+
});
16+
}, []);
617
const returnMoodOfDate = (date) => {
718
return moods.filter((mood) => mood.date === date);
819
};

src/components/bases/Tally.jsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1-
import React from "react";
1+
import React, { useEffect } from "react";
2+
import axios from "axios";
23

3-
export default function Tally(props) {
4-
const [tallies, setTallies] = React.useState(props.tallies);
4+
export default function Tally() {
5+
const [tallies, setTallies] = React.useState([]);
56
const [categories, setCategories] = React.useState(["other", "work", "home"]);
7+
useEffect(() => {
8+
axios
9+
.get("http://localhost:3001/tallies")
10+
.then((response) => {
11+
setTallies(response.data);
12+
})
13+
.catch((err) => {
14+
console.log("error");
15+
});
16+
}, []);
617
const minusCount = (id) => {
718
setTallies(
819
tallies.map((tally) => {

src/components/bases/Tasks.jsx

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
import React from "react";
1+
import React, { useEffect } from "react";
2+
const axios = require("axios");
23

3-
export default function Tasks(props) {
4-
const [tasks, setTasks] = React.useState(props.tasks);
4+
export default function Tasks() {
5+
const [tasks, setTasks] = React.useState([]);
6+
useEffect(() => {
7+
axios
8+
.get("http://localhost:3001/tasks")
9+
.then((response) => {
10+
setTasks(response.data);
11+
})
12+
.catch((err) => {
13+
console.log("error");
14+
});
15+
}, []);
516
const [categories, setCategories] = React.useState(["other", "work", "home"]);
617
const addTask = (e) => {
718
if (e.key === "Enter" && e.target.value !== "") {

src/components/bases/Timer.jsx

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ export default function Timer(props) {
9292
saveS.toString().padStart(2, "0"),
9393
...history,
9494
]);
95+
isFocus
96+
? setTotalTimeFocused(
97+
totalTimeFocused +
98+
(new Date().getTime() - startTime.getTime()) / 60000
99+
)
100+
: setTotalTimeBreak(
101+
totalTimeBreak +
102+
(new Date().getTime() - startTime.getTime()) / 60000
103+
);
95104
} else {
96105
setH(h - 1);
97106
setM(59);
@@ -107,7 +116,20 @@ export default function Timer(props) {
107116
}, 1000);
108117
return () => clearInterval(interval);
109118
}
110-
}, [started, h, m, s, saveH, saveM, saveS, history]);
119+
}, [
120+
started,
121+
h,
122+
m,
123+
s,
124+
saveH,
125+
saveM,
126+
saveS,
127+
isFocus,
128+
startTime,
129+
history,
130+
totalTimeBreak,
131+
totalTimeFocused,
132+
]);
111133
if (h < 0) {
112134
setH(0);
113135
setM(0);

0 commit comments

Comments
 (0)