From 57575a92596e553a4c044ddaada5302e33ec04b5 Mon Sep 17 00:00:00 2001 From: lutharsanen <34275865+lutharsanen@users.noreply.github.com> Date: Fri, 4 Dec 2020 12:32:41 +0100 Subject: [PATCH 1/3] added twice in percentage --- sourceCode/src/react/components/Summary/DonutChart.js | 2 +- .../src/react/components/Summary/OverviewCharts/AnalyseChart.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sourceCode/src/react/components/Summary/DonutChart.js b/sourceCode/src/react/components/Summary/DonutChart.js index ce020e6..af1f815 100644 --- a/sourceCode/src/react/components/Summary/DonutChart.js +++ b/sourceCode/src/react/components/Summary/DonutChart.js @@ -135,7 +135,7 @@ function DonutChart(props) { legend: { display: true }, title: { display: false, - text: "Time spent in focus or in each service", + text: "Time spent in focus or in each service in percentage", }, maintainAspectRatio: true, responsive: true, diff --git a/sourceCode/src/react/components/Summary/OverviewCharts/AnalyseChart.js b/sourceCode/src/react/components/Summary/OverviewCharts/AnalyseChart.js index 1aeb7bd..a13ed02 100644 --- a/sourceCode/src/react/components/Summary/OverviewCharts/AnalyseChart.js +++ b/sourceCode/src/react/components/Summary/OverviewCharts/AnalyseChart.js @@ -159,7 +159,7 @@ function AnalyseChart(props) { legend: { display: true }, title: { display: true, - text: "usage of applications during focus time", + text: "usage of applications during focus time in percentage", }, maintainAspectRatio: false, responsive: true, From a5f25ba3033190ca2f825293ddf1ee5b5113f9be Mon Sep 17 00:00:00 2001 From: lutharsanen <34275865+lutharsanen@users.noreply.github.com> Date: Fri, 4 Dec 2020 12:39:57 +0100 Subject: [PATCH 2/3] apps sorted in alphabetical order --- sourceCode/src/react/Pages/DistractingApps.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sourceCode/src/react/Pages/DistractingApps.js b/sourceCode/src/react/Pages/DistractingApps.js index 98d7301..05eb15c 100644 --- a/sourceCode/src/react/Pages/DistractingApps.js +++ b/sourceCode/src/react/Pages/DistractingApps.js @@ -57,7 +57,7 @@ function DistractingApps() { useEffect(() => { ipcRenderer.on("distracting-apps", (e, array) => { - setDisArray(array); + setDisArray(array.sort()); }); ipcRenderer.send("distracting-apps"); }, []); From 8dd61d21b7e295bb07cb0b2a332c1bc126ece896 Mon Sep 17 00:00:00 2001 From: lutharsanen <34275865+lutharsanen@users.noreply.github.com> Date: Fri, 4 Dec 2020 12:48:18 +0100 Subject: [PATCH 3/3] added pointer by on hover button effekt --- sourceCode/src/react/components/Home/MenuBoxes.js | 6 +++--- sourceCode/src/react/components/Navbar/Navbar.js | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sourceCode/src/react/components/Home/MenuBoxes.js b/sourceCode/src/react/components/Home/MenuBoxes.js index 3f9197f..030991b 100644 --- a/sourceCode/src/react/components/Home/MenuBoxes.js +++ b/sourceCode/src/react/components/Home/MenuBoxes.js @@ -95,7 +95,7 @@ function MenuBoxes(props) { return ( - + @@ -103,7 +103,7 @@ function MenuBoxes(props) { - + {calendarRegistered ? (
@@ -129,7 +129,7 @@ function MenuBoxes(props) {
)}
- + diff --git a/sourceCode/src/react/components/Navbar/Navbar.js b/sourceCode/src/react/components/Navbar/Navbar.js index cfbfd34..d06ab97 100644 --- a/sourceCode/src/react/components/Navbar/Navbar.js +++ b/sourceCode/src/react/components/Navbar/Navbar.js @@ -38,7 +38,12 @@ function Navbar(props) {
history.push("/")} - style={{ color: Colors.snow, fontSize: 50, margin: "0.5rem 1rem" }} + style={{ + color: Colors.snow, + fontSize: 50, + margin: "0.5rem 1rem", + cursor: "pointer", + }} /> {props.services.map((service) => { if (!service.isOther) { @@ -92,6 +97,7 @@ function Navbar(props) { color: Colors.snow, fontSize: 50, margin: "0.5rem 1rem", + cursor: "pointer", }} /> ) : null} @@ -116,6 +123,7 @@ function Navbar(props) { color: Colors.snow, fontSize: 50, margin: "0.5rem 1rem", + cursor: "pointer", }} /> @@ -125,6 +133,7 @@ function Navbar(props) { color: Colors.snow, fontSize: 50, margin: "0.5rem 1rem", + cursor: "pointer", }} />