farmcontrol/farmcontrol-ui
farmcontrol/farmcontrol-ui
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: farmcontrol:5242650ccd321c0ba54faa4c89ac1ad231589512
Branches Tags
farmcontrol:main
farmcontrol:electrobun-migration
..
compare: farmcontrol:6be21bd006258c77159dfd3e7cd11f3e44332065
Branches Tags
farmcontrol:main
farmcontrol:electrobun-migration

No commits in common. "5242650ccd321c0ba54faa4c89ac1ad231589512" and "6be21bd006258c77159dfd3e7cd11f3e44332065" have entirely different histories.
5242650ccd ... 6be21bd006

5 changed files with 8 additions and 13 deletions
Show Stats Expand all files Collapse all files

5
assets/stylesheets/App.css
View File

@ -407,8 +407,3 @@ body {
border-radius: 0 !important;
box-shadow: none !important;
}
.ant-modal .ant-modal-content {
border-radius: 22px;
padding: 24px;
}

10
index.html
View File

@ -2,17 +2,17 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="./favicon.ico" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="./logo192.png" />
<link rel="manifest" href="./manifest.json" />
<link rel="stylesheet" href="./fonts/fonts.css" preload />
<link rel="stylesheet" href="./preload.css" preload />
<link rel="apple-touch-icon" href="/logo192.png" />
<link rel="manifest" href="/manifest.json" />
<link rel="stylesheet" href="/fonts/fonts.css" preload />
<link rel="stylesheet" href="/preload.css" preload />
<script type="module" src="/src/index.jsx"></script>
<title>Farm Control</title>
</head>

2
src/components/Dashboard/common/WizardView.jsx
View File

@ -65,7 +65,7 @@ const WizardView = ({
}
>
<Flex vertical gap='middle' style={{ flexGrow: 1, width: '100%' }}>
<Title level={2} style={{ margin: '0 0 8px 0', lineHeight: 0.7 }}>
<Title level={2} style={{ margin: 0 }}>
{title}
</Title>
<div style={{ minHeight: '260px', marginBottom: 4, width: '100%' }}>

2
src/database/models/Invoice.js
View File

@ -252,7 +252,7 @@ export const Invoice = {
readOnly: true,
value: (objectData) => {
if (objectData?.orderType == 'salesOrder') {
return objectData?.to
return objectData?.order?.client
} else {
return null
}

2
vite.config.js
View File

@ -11,7 +11,7 @@ const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
export default defineConfig({
base: './', // Required for Electron file:// protocol - absolute paths fail
base: '/',
resolve: {
alias: {
three: path.resolve(__dirname, 'node_modules/three')