ElementsProject · evansmj · Apr 23, 2024 · Jun 2, 2024 · Jun 2, 2024 · Jun 3, 2024
diff --git a/apps/frontend/build/asset-manifest.json b/apps/frontend/build/asset-manifest.json
@@ -1,29 +1,17 @@
 {
   "files": {
-    "main.css": "/static/css/main.11b562ff.css",
-    "main.js": "/static/js/main.8ff0239a.js",
-    "static/css/948.46c85475.chunk.css": "/static/css/948.46c85475.chunk.css",
-    "static/js/948.256093c8.chunk.js": "/static/js/948.256093c8.chunk.js",
-    "static/css/642.31d6cfe0.chunk.css": "/static/css/642.31d6cfe0.chunk.css",
-    "static/js/642.b93ff6b0.chunk.js": "/static/js/642.b93ff6b0.chunk.js",
-    "static/css/622.31d6cfe0.chunk.css": "/static/css/622.31d6cfe0.chunk.css",
-    "static/js/622.86bd9b9e.chunk.js": "/static/js/622.86bd9b9e.chunk.js",
-    "static/js/420.1c2ec4dd.chunk.js": "/static/js/420.1c2ec4dd.chunk.js",
+    "main.css": "/static/css/main.79f288c9.css",
+    "main.js": "/static/js/main.69a32e2c.js",
     "static/media/Inter-Bold.ttf": "/static/media/Inter-Bold.88fa7ae373b07b41ecce.ttf",
     "static/media/Inter-SemiBold.ttf": "/static/media/Inter-SemiBold.4d56bb21f2399db8ad48.ttf",
     "static/media/Inter-Medium.ttf": "/static/media/Inter-Medium.6dcbc9bed1ec438907ee.ttf",
     "static/media/Inter-Thin.ttf": "/static/media/Inter-Thin.f341ca512063c66296d1.ttf",
     "index.html": "/index.html",
-    "main.11b562ff.css.map": "/static/css/main.11b562ff.css.map",
-    "main.8ff0239a.js.map": "/static/js/main.8ff0239a.js.map",
-    "948.46c85475.chunk.css.map": "/static/css/948.46c85475.chunk.css.map",
-    "948.256093c8.chunk.js.map": "/static/js/948.256093c8.chunk.js.map",
-    "642.b93ff6b0.chunk.js.map": "/static/js/642.b93ff6b0.chunk.js.map",
-    "622.86bd9b9e.chunk.js.map": "/static/js/622.86bd9b9e.chunk.js.map",
-    "420.1c2ec4dd.chunk.js.map": "/static/js/420.1c2ec4dd.chunk.js.map"
+    "main.79f288c9.css.map": "/static/css/main.79f288c9.css.map",
+    "main.69a32e2c.js.map": "/static/js/main.69a32e2c.js.map"
   },
   "entrypoints": [
-    "static/css/main.11b562ff.css",
-    "static/js/main.8ff0239a.js"
+    "static/css/main.79f288c9.css",
+    "static/js/main.69a32e2c.js"
   ]
 }
diff --git a/apps/frontend/build/index.html b/apps/frontend/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="/images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.8ff0239a.js"></script><link href="/static/css/main.11b562ff.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="./images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.69a32e2c.js"></script><link href="/static/css/main.79f288c9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/apps/frontend/build/static/css/main.79f288c9.css b/apps/frontend/build/static/css/main.79f288c9.css
diff --git a/apps/frontend/build/static/css/main.79f288c9.css.map b/apps/frontend/build/static/css/main.79f288c9.css.map
diff --git a/apps/frontend/build/static/js/main.69a32e2c.js b/apps/frontend/build/static/js/main.69a32e2c.js
diff --git a/apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt b/apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
@@ -0,0 +1,119 @@
+/*!
+	Copyright (c) 2018 Jed Watson.
+	Licensed under the MIT License (MIT), see
+	http://jedwatson.github.io/classnames
+*/
+
+/*!
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
+========
+  react-datepicker v7.6.0
+  https://github.com/Hacker0x01/react-datepicker
+  Released under the MIT License.
+*/
+
+/*!
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
+ * Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2024 Fonticons, Inc.
+ */
+
+/*!
+ * perfect-scrollbar v1.5.6
+ * Copyright 2024 Hyunje Jun, MDBootstrap and Contributors
+ * Licensed under MIT
+ */
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license qrcode.react
+ * Copyright (c) Paul O'Shannessy
+ * SPDX-License-Identifier: ISC
+ */
+
+/**
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
+ * @remix-run/router v1.23.0
+========
+ * @remix-run/router v1.22.0
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/**
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
+ * React Router DOM v6.30.0
+========
+ * React Router DOM v6.29.0
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/**
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
+ * React Router v6.30.0
+========
+ * React Router v6.29.0
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+//! moment.js
diff --git a/apps/frontend/build/static/js/main.69a32e2c.js.map b/apps/frontend/build/static/js/main.69a32e2c.js.map
diff --git a/apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt b/apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
@@ -5,6 +5,15 @@
 */
 
 /*!
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
+========
+  react-datepicker v7.6.0
+  https://github.com/Hacker0x01/react-datepicker
+  Released under the MIT License.
+*/
+
+/*!
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
  * Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com
  * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
  * Copyright 2024 Fonticons, Inc.
@@ -63,7 +72,11 @@
  */
 
 /**
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
  * @remix-run/router v1.23.0
+========
+ * @remix-run/router v1.22.0
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -74,7 +87,11 @@
  */
 
 /**
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
  * React Router DOM v6.30.0
+========
+ * React Router DOM v6.29.0
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -85,7 +102,11 @@
  */
 
 /**
+<<<<<<<< HEAD:apps/frontend/build/static/js/main.8ff0239a.js.LICENSE.txt
  * React Router v6.30.0
+========
+ * React Router v6.29.0
+>>>>>>>> 2c975d4 (Compiled code after all bookkeeper updatescommits):apps/frontend/build/static/js/main.69a32e2c.js.LICENSE.txt
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -94,3 +115,5 @@
  *
  * @license MIT
  */
+
+//! moment.js
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -17,11 +17,14 @@
     "bootstrap": "^5.3.2",
     "copy-to-clipboard": "^3.3.3",
     "crypto-js": "^4.2.0",
+    "d3": "^7.9.0",
     "framer-motion": "^10.16.5",
-    "node-sass": "^9.0.0",
+    "moment": "^2.30.1",
+    "node-sass": "^7.0.3",
     "qrcode.react": "^3.1.0",
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.1",
+    "react-datepicker": "^7.3.0",
     "react-dom": "^18.2.0",
     "react-perfect-scrollbar": "^1.5.8",
     "react-router-dom": "^6.22.1"
@@ -30,6 +33,7 @@
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^14.2.1",
     "@testing-library/user-event": "^14.5.1",
+    "@types/d3": "^7.4.3",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.9.4",
     "@types/react": "^18.2.61",

diff --git a/apps/frontend/src/components/App/App.tsx b/apps/frontend/src/components/App/App.tsx
@@ -1,5 +1,3 @@
-import React from 'react';
-
 import './App.scss';
 import { useContext, useEffect } from 'react';
 import { Outlet } from 'react-router-dom';
@@ -18,11 +16,32 @@ import LogoutComponent from '../modals/Logout/Logout';
 import SetPasswordComponent from '../modals/SetPassword/SetPassword';
 import logger from '../../services/logger.service';
 import { AuthResponse } from '../../types/app-config.type';
-import { EmptyHome } from '../ui/Loading/Loading';
+import Bookkeeper from '../bookkeeper/BkprRoot/BkprRoot';
+import CLNHome from '../cln/CLNHome/CLNHome';
+import BalanceSheetRoot from '../bookkeeper/BalanceSheet/BalanceSheetRoot';
+import SatsFlowRoot from '../bookkeeper/SatsFlow/SatsFlowRoot';
+import VolumeRoot from '../bookkeeper/Volume/VolumeRoot';
+import Terminal from '../bookkeeper/Terminal/TerminalRoot';
+
+export const rootRouteConfig = [
+  {
+    path: "/", Component: Root,
+    children: [
+      { path: "/", Component: () => <Navigate to="/home" replace /> },
+      { path: "home", Component: CLNHome },
+      { path: "bookkeeper", Component: Bookkeeper },
+      { path: "bookkeeper/balancesheet", Component: BalanceSheetRoot },
+      { path: "bookkeeper/satsflow", Component: SatsFlowRoot },
+      { path: "bookkeeper/volume", Component: VolumeRoot },
+      { path: "bookkeeper/terminal", Component: Terminal }
+    ]
+  },
+];
+
+const rootRouter = createBrowserRouter(rootRouteConfig);
 
-function App() {
-  const rootCtx = useContext(RootContext);
-  const clnCtx = useContext(CLNContext);
+function Root() {
+  const appCtx = useContext(AppContext);
   const currentScreenSize = useBreakpoint();
   const { setCSRFToken, getAppConfigurations, getAuthStatus, initiateDataLoading } = useHttp();
 

diff --git a/apps/frontend/src/components/bookkeeper/BalanceSheet/BalanceSheetRoot.scss b/apps/frontend/src/components/bookkeeper/BalanceSheet/BalanceSheetRoot.scss
@@ -0,0 +1,93 @@
+@import '../../../styles/constants.scss';
+
+.react-datepicker-popper {
+  .react-datepicker {
+    border-color: $border-color;
+
+    &__header {
+      background-color: transparent;
+      border-bottom-color: $border-color;
+    }
+
+    &__navigation {
+      &-icon::before {
+        border-color: currentColor;
+      }
+
+      &:hover *::before {
+        border-color: $primary;
+      }
+    }
+
+    &__day {
+      &:hover {
+        background-color: rgba($primary, 0.1);
+        color: $primary;
+      }
+
+      &--selected {
+        background-color: $primary;
+        color: white;
+
+        &:hover {
+          background-color: darken($primary, 5%);
+        }
+      }
+
+      &--keyboard-selected {
+        background-color: rgba($primary, 0.1);
+        color: $primary;
+      }
+    }
+
+    &__current-month,
+    &__day-name {
+      color: inherit;
+    }
+  }
+}
+
+@include color-mode(dark) {
+  .react-datepicker-popper {
+    .react-datepicker {
+      background-color: $picker-background-color-dark;
+      border-color: $picker-border-color-dark;
+
+      &__header {
+        background-color: $picker-background-color-dark;
+        border-bottom-color: $picker-border-color-dark;
+      }
+
+      &__current-month,
+      &__day-name,
+      &__day {
+        color: $light-dark;
+      }
+
+      &__day {
+        &:hover {
+          background-color: rgba($primary, 0.1);
+          color: $primary;
+        }
+
+        &--selected {
+          background-color: $primary;
+          color: $white;
+
+          &:hover {
+            background-color: darken($primary, 5%);
+          }
+        }
+
+        &--keyboard-selected {
+          background-color: rgba($primary, 0.1);
+          color: $primary;
+        }
+      }
+
+      &__navigation-icon::before {
+        border-color: $light-dark;
+      }
+    }
+  }
+}
diff --git a/apps/frontend/src/components/bookkeeper/BalanceSheet/BalanceSheetRoot.test.tsx b/apps/frontend/src/components/bookkeeper/BalanceSheet/BalanceSheetRoot.test.tsx
@@ -0,0 +1,15 @@
+import { render, screen } from '@testing-library/react';
+import BalanceSheetRoot from './BalanceSheetRoot';
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: jest.fn(),
+}));
+
+describe('Balance Sheet component ', () => {
+  beforeEach(() => render(<BalanceSheetRoot />));
+
+  it('should be in the document', () => {
+    expect(screen.getByTestId('balancesheet-container')).not.toBeEmptyDOMElement()
+  });
+});
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="/images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.8ff0239a.js"></script><link href="/static/css/main.11b562ff.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./images/cln-favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="color-scheme" content="light dark"><meta name="description" content="Core lightning application"/><link rel="apple-touch-icon" href="./images/cln-logo-dark.png"/><title>Core Lightning</title><script defer="defer" src="/static/js/main.69a32e2c.js"></script><link href="/static/css/main.79f288c9.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>