Merge branch 'deni-dev(pc)' into 'master'

end session

See merge request !239

src/container/BudgetTahunan/BalanceSheet.js

@@ -1967,7 +1967,7 @@ export default class BalanceSheet extends Component {
                                 </MuiThemeProvider>
                             </div>
                         </div>
-                        <div className="grid grid-2x">
+                        <div className="grid grid-2x" style={{ marginTop: 20}}>
                             <div className="col-1">
                                 <button
                                     className="button"

src/container/Home.js

@@ -372,6 +372,14 @@ export default function MiniDrawer() {
     })
   }
 
+  if (sessionStorage.getItem('reloaded') != null) {
+    console.log('page was reloaded');
+  } else {
+    localStorage.removeItem(Constant.TOKEN)
+    window.location.reload();
+  }
+  sessionStorage.setItem('reloaded', 'yes');
+
   const logout = () => {
     localStorage.removeItem(Constant.TOKEN)
     window.location.reload();

src/library/CustomTable.js

@@ -344,6 +344,123 @@ exports.customTable2 = function () {
   }
 }
 
+exports.customTable3 = function () {
+  return {
+    typography: {
+      useNextVariants: true,
+    },
+    overrides: {
+      MUIDataTable: {
+        root: {
+          backgroundColor: secondColor,
+        },
+        paper: {
+          boxShadow: "0 0 30px 0 rgba(154,161,171,.15)",
+          border: "1px rgba(0,0,0,0.1) solid",
+          borderRadius: "5px",
+          overflow: "hidden",
+        },
+      },
+      MuiToolbar: {
+        root: {
+          left: {
+            flex: "0 0 auto !important"
+          },
+          actions: {
+            flex: "0 0 auto !important"
+          }
+        }
+      },
+      MUIDataTableToolbar: {
+        root: {
+          backgroundColor: secondColor,
+        },
+        titleText: {
+          color: "#555"
+        },
+        icon: {
+          color: "#555"
+        },
+      },
+      MUIDataTableSearch: {
+        searchIcon: {
+          color: "#555"
+        },
+        searchText: {
+          color: "#555",
+        },
+        clearIcon: {
+          color: "#555"
+        },
+      },
+      MUIDataTableHead: {
+        main: {
+          backgroundColor: mainColor,
+          color: "#555"
+        }
+      },
+      MUIDataTableHeadRow: {
+        root: {
+          backgroundColor: mainColor,
+        }
+      },
+      MUIDataTableHeadCell: {
+        root: {
+          fontSize: "10pt",
+          fontWeight: "500",
+          color: mainColor,
+        },
+        fixedHeader: {
+          position: "relative",
+          backgroundColor: secondColor,
+          color: "#555",
+          padding: "10px",
+          height: "auto",
+        },
+        toolButton: {
+          display: "flex",
+          height: "auto"
+        },
+        data: {
+          display: "inline-block",
+          verticalAlign: "top",
+        },
+        sortActive: {
+          color: "#555"
+        },
+        sortAction: {
+          color: "#555",
+          display: "inline-block",
+          verticalAlign: "top",
+          MuiButtonBase: {
+            color: "#555",
+            root: {
+              color: "#555",
+            }
+          }
+        }
+      },
+      MUIDataTableBodyCell: {
+        root: {
+          fontSize: "10pt",
+          padding: "3px"
+        }
+      },
+      MUIDataTableSelectCell: {
+        headerCell: {
+          backgroundColor: secondColor,
+          checkboxRoot: {
+            color: "#fff",
+          }
+        },
+        checkboxRoot: {
+          color: "#555"
+        }
+      },
+    }
+  }
+}
+
 exports.customOptions = function () {
   return {
     // selectableRows: false,