Merge branch 'master' of github.com:bugii/ExMan

bugii · Dec 5, 2020 · f5e7c51 · f5e7c51
2 parents 9e9d256 + 8dd61d2
commit f5e7c51
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git 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");
   }, []);

diff --git a/sourceCode/src/react/components/Home/MenuBoxes.js b/sourceCode/src/react/components/Home/MenuBoxes.js
@@ -95,15 +95,15 @@ function MenuBoxes(props) {
 
   return (
     <MenuBoxContainer>
-      <MenuBoxDiv onClick={props.handleFocusNow}>
+      <MenuBoxDiv onClick={props.handleFocusNow} style={{ cursor: "pointer" }}>
         <MenuIcon>
           <FilterCenterFocusIcon style={{ fontSize: 150 }} />
         </MenuIcon>
         focus now
       </MenuBoxDiv>
       <MenuBoxDiv>
         <MenuIcon>
-          <TodayIcon style={{ fontSize: 150, marginTop: 32}} />
+          <TodayIcon style={{ fontSize: 150, marginTop: 32 }} />
         </MenuIcon>
         {calendarRegistered ? (
           <div style={{ textAlign: "center" }}>
@@ -129,7 +129,7 @@ function MenuBoxes(props) {
           </div>
         )}
       </MenuBoxDiv>
-      <MenuBoxDiv onClick={openDashboard}>
+      <MenuBoxDiv onClick={openDashboard} style={{ cursor: "pointer" }}>
         <MenuIcon>
           <EqualizerIcon style={{ fontSize: 150 }} />
         </MenuIcon>

diff --git a/sourceCode/src/react/components/Navbar/Navbar.js b/sourceCode/src/react/components/Navbar/Navbar.js
@@ -38,7 +38,12 @@ function Navbar(props) {
       <div style={{ display: "flex", flexDirection: "column" }}>
         <HomeIcon
           onClick={() => 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",
           }}
         />
         <NewFocusSession
@@ -106,6 +112,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",
           }}
         />
       </div>

diff --git 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
@@ -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,