update conflict

package.json

@@ -12,6 +12,7 @@
     "font-awesome": "^4.7.0",
     "mui-datatables": "^3.3.1",
     "react": "^16.13.1",
+    "react-d3-donut": "^1.1.2",
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.1"

src/assets/Images.js

@@ -17,6 +17,8 @@ const Images = {
     imageLogin: require('./image.svg'),
     email: require('./email.svg'),
     key: require('./key.svg'),
+    green: require('./green.svg'),
+    red: require('./red.svg'),
 
     //Image
     triputra: require('./triputra.png'),

src/assets/green.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
+    <g fill="none" fill-rule="evenodd">
+        <path d="M0 0H16V16H0z" transform="matrix(1 0 0 -1 -3 13)"/>
+        <g stroke="#4CAF50" stroke-linecap="round">
+            <path stroke-linejoin="round" d="M8 7.243L2 7.243 2 1.243" transform="matrix(1 0 0 -1 -3 13) translate(3 3.757) rotate(-45 5 4.243)"/>
+            <path d="M5 8.485L5 0" transform="matrix(1 0 0 -1 -3 13) translate(3 3.757)"/>
+        </g>
+    </g>
+</svg>

src/assets/red.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="10" viewBox="0 0 10 10">
+    <g fill="none" fill-rule="evenodd">
+        <path d="M0 0H16V16H0z" transform="translate(-3 -3)"/>
+        <g stroke="#F65A4C" stroke-linecap="round">
+            <path stroke-linejoin="round" d="M8 7.243L2 7.243 2 1.243" transform="translate(-3 -3) translate(3 3.757) rotate(-45 5 4.243)"/>
+            <path d="M5 8.485L5 0" transform="translate(-3 -3) translate(3 3.757)"/>
+        </g>
+    </g>
+</svg>

src/router/homeRoutes.js

 import screen404 from '../container/Screen404'
 import Beranda from '../container/Beranda'
-import ApprovalMatrix from '../container/ApprovalMatrix'
+import HomePage from '../container/HomePage';
 
 const routes = [
     {
       path: "/home/beranda",
-      main: Beranda
+      main: HomePage
     },
     {
       path: "/home/screen404",
       main: screen404
     },
-    {
-      path: "/home/approval",
-      main: ApprovalMatrix
-    },
+    
   ];
 
 export default routes;
\ No newline at end of file