mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-17 16:38:41 +00:00
* feat: new banking module (#54720)
* feat: initial SPA setup for banking
* wip: bring over new banking module
* feat: added Espresso design tokens
* feat: button styles
* fix: add all ink colors
* wip: espresso design system changes
* feat: button and badge espresso components
* fix: button styling for reconcile
* feat: Espresso progress bar
* feat: Espresso toggle switch
* feat: Espresso tabs design
* fix: vertical tab support
* fix: button sizing across modals
* feat: Espresso style table layout
* feat: Espresso tooltip
* feat: Espresso elevations and checkbox
* feat: Dialog with Espresso styles
* feat: Espresso textarea
* fix: input styles
* fix: colors on bank picker
* fix: breadcrumb styling
* fix: bank picker styling
* feat: create doctypes and fields for bank reconciliation
* feat: APIs for banking
* fix: use date format parser
* fix: font styling to match Espresso
* wip: settings modal
* feat: settings dialog component
* fix: icons and invalid requests
* feat: preferences tab
* fix: adjust icon stroke width to 1.5
* feat: rule configuration in settings
* fix: remove sheet component
* feat: alert and error banner component
* feat: dropdown in Espresso
* feat: popover and select in Espresso
* fix: cleanup more styles
* fix: match size of link fields
* feat: command styling
* fix: remove unused style tokens
* fix: styles for global date picker dropdown
* fix: styles for match and reconcile
* feat: table Espresso component
* feat: remove all other design tokens
* fix: remove unused tokens
* fix: form elements
* fix: remove unused styles and fix filters in bank transaction list
* feat: fetch bank rec doctypes for filtering
* fix: record payment modal
* feat: support for dark mode switching
* fix: move bank logos to public folder
* feat: add support for RTL
* feat: support for RTL
* chore: send layout direction in dev boot
* fix: make checkbox work in RTL
* feat: dark mode support
* fix: dark mode style
* feat: bank logos in dark mode
* feat: dark mode bank logos
* chore: use dark mode bank logos everywhere
* chore: move rule evaluation to controller
* chore: add tests for bank transaction rules
* fix: move deps to fix actions errors
* fix: move tw-animate-css to deps
* fix: remove shadcn
* fix: do not open modal if no transactions selected
* fix: add translation strings
* feat: add banner on existing bank reconciliation tool
* feat: bank statement import
* fix: translations and layout directions
* fix: validation for transaction matching rule
* fix: styles
* fix: show conflicting transactions in alert
* fix: show help text for new banking module forms
* feat: show total debits and credits
* fix: dark mode colors in automatic config
* feat: add keyboard shortcuts help
* feat: added keyboard shortcut for settings
* fix: decrease size of progress bar
* chore: bump packages
* feat: add tests for statement import
* fix: settings dialog
* fix: show banner on small screens
* fix: show banner when no bank account set
(cherry picked from commit 6de5367f12)
# Conflicts:
# erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
* chore: resolve conflicts
* fix: add type hints to whitelisted methods
---------
Co-authored-by: Nikhil Kothari <nik.kothari22@live.com>
66 lines
2.2 KiB
TypeScript
66 lines
2.2 KiB
TypeScript
import { useEffect } from 'react'
|
|
import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom'
|
|
import { FrappeProvider } from 'frappe-react-sdk'
|
|
import { Toaster } from '@/components/ui/sonner'
|
|
import BankReconciliation from '@/pages/BankReconciliation'
|
|
import { TooltipProvider } from './components/ui/tooltip'
|
|
import BankStatementImporter from '@/pages/BankStatementImporter'
|
|
import { LucideProvider } from 'lucide-react'
|
|
import { ThemeProvider } from './components/ui/theme-provider'
|
|
import ViewBankStatementImportLog from './pages/ViewBankStatementImportLog'
|
|
import BankStatementImporterContainer from './pages/BankStatementImporterContainer'
|
|
|
|
function App() {
|
|
useEffect(() => {
|
|
// Check if user is logged in by checking the Cookie "user_id"
|
|
// In Frappe, unauthenticated users are "Guest"
|
|
const userId = document.cookie?.split('; ').find(row => row.startsWith('user_id='))?.split('=')[1]?.trim()
|
|
const isLoggedIn = userId !== 'Guest'
|
|
|
|
if (!isLoggedIn) {
|
|
if (import.meta.env.DEV) {
|
|
return
|
|
}
|
|
// Redirect to Frappe login page
|
|
window.location.href = '/login?redirect-to=/banking'
|
|
return
|
|
}
|
|
}, [])
|
|
|
|
return (
|
|
<LucideProvider
|
|
strokeWidth={1.5}
|
|
>
|
|
<TooltipProvider>
|
|
<FrappeProvider
|
|
swrConfig={{
|
|
errorRetryCount: 2
|
|
}}
|
|
socketPort={import.meta.env.VITE_SOCKET_PORT}
|
|
siteName={window.frappe?.boot?.sitename ?? import.meta.env.VITE_SITE_NAME}>
|
|
<ThemeProvider
|
|
defaultTheme={window.frappe?.boot?.desk_theme ?? "Automatic"}
|
|
>
|
|
{window.frappe?.boot?.user?.name && window.frappe?.boot?.user?.name !== 'Guest' &&
|
|
<BrowserRouter basename={import.meta.env.VITE_BASE_NAME ? `/${import.meta.env.VITE_BASE_NAME}` : ''}>
|
|
|
|
<Routes>
|
|
<Route index element={<BankReconciliation />} />
|
|
<Route path="/statement-importer" element={<BankStatementImporterContainer />}>
|
|
<Route index element={<BankStatementImporter />} />
|
|
<Route path=":id" element={<ViewBankStatementImportLog />} />
|
|
</Route>
|
|
<Route path="*" element={<Navigate to="/" />} />
|
|
</Routes>
|
|
</BrowserRouter>
|
|
}
|
|
<Toaster richColors />
|
|
</ThemeProvider>
|
|
</FrappeProvider>
|
|
</TooltipProvider>
|
|
</LucideProvider>
|
|
)
|
|
}
|
|
|
|
export default App
|