diff --git a/Jenkinsfile b/Jenkinsfile
index 6b5cf9c..04a1a07 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,7 +20,7 @@ def deploy() {
stage('Build (Ubuntu)') {
nodejs(nodeJSInstallationName: 'Node23') {
- sh 'NODE_ENV=production pnpm build:cloudflare'
+ sh "VITE_BUILD_NUMBER=${env.BUILD_NUMBER} NODE_ENV=production pnpm build:cloudflare"
}
}
@@ -70,9 +70,9 @@ def buildOnLabel(label, buildCommand) {
stage("Build (${label})") {
nodejs(nodeJSInstallationName: 'Node23') {
if (isUnix()) {
- sh "NODE_ENV=production ${buildCommand}"
+ sh "VITE_BUILD_NUMBER=${env.BUILD_NUMBER} NODE_ENV=production ${buildCommand}"
} else {
- bat "set NODE_ENV=production && ${buildCommand}"
+ bat "set VITE_BUILD_NUMBER=${env.BUILD_NUMBER} && set NODE_ENV=production && ${buildCommand}"
}
}
}
diff --git a/assets/stylesheets/App.css b/assets/stylesheets/App.css
index f7ff927..96d4d41 100644
--- a/assets/stylesheets/App.css
+++ b/assets/stylesheets/App.css
@@ -596,3 +596,9 @@ body {
.ant-table-wrapper .ant-table-filter-column {
align-items: center;
}
+
+span.ant-skeleton-input.ant-skeleton-input-sm.text-skeleton {
+ width: 50px;
+ min-width: 0;
+ height: 20px;
+}
diff --git a/public/appupdate.js b/public/appupdate.js
new file mode 100644
index 0000000..e69de29
diff --git a/public/mainWindow.js b/public/mainWindow.js
index 28e5929..39f6d66 100644
--- a/public/mainWindow.js
+++ b/public/mainWindow.js
@@ -206,6 +206,10 @@ export function getWindow() {
return win
}
+export function getElectronVersion() {
+ return process.versions.electron
+}
+
export function setupMainWindowIPC() {
// IPC handler to get window state
ipcMain.handle('window-state', () => {
@@ -267,6 +271,8 @@ export function setupMainWindowIPC() {
applyApplicationMenu()
return true
})
+
+ ipcMain.handle('electron-version', () => getElectronVersion())
}
export function setupMainWindowAppEvents(app) {
diff --git a/src/components/Dashboard/Management/About.jsx b/src/components/Dashboard/Management/About.jsx
new file mode 100644
index 0000000..78f95b3
--- /dev/null
+++ b/src/components/Dashboard/Management/About.jsx
@@ -0,0 +1,180 @@
+import { useContext, useEffect, useState } from 'react'
+import {
+ Flex,
+ Typography,
+ Button,
+ Dropdown,
+ Skeleton,
+ Tag,
+ Divider
+} from 'antd'
+import useCollapseState from '../hooks/useCollapseState'
+import InfoCollapse from '../common/InfoCollapse'
+import InfoCircleIcon from '../../Icons/InfoCircleIcon'
+import ReloadIcon from '../../Icons/ReloadIcon'
+import DeveloperIcon from '../../Icons/DeveloperIcon'
+import { version as appVersion } from '../../../../package.json'
+import { ApiServerContext } from '../context/ApiServerContext'
+import { AuthContext } from '../context/AuthContext'
+import { ElectronContext } from '../context/ElectronContext'
+import { useMediaQuery } from 'react-responsive'
+const { Title, Text, Link } = Typography
+
+const About = () => {
+ const [collapseState, updateCollapseState] = useCollapseState('About', {
+ updater: true
+ })
+ const { token } = useContext(AuthContext)
+ const actions = [
+ {
+ label: 'Check for Updates',
+ icon: ,
+ onClick: () => {
+ console.log('Check for Updates')
+ }
+ }
+ ]
+
+ const buildNumber = import.meta.env.VITE_BUILD_NUMBER
+ ? 'b' + import.meta.env.VITE_BUILD_NUMBER
+ : 'dev'
+ const developmentMode = import.meta.env.MODE === 'development'
+
+ const { fetchApiServerVersion, fetchWsServerVersion } =
+ useContext(ApiServerContext)
+ const { isElectron, getElectronVersion } = useContext(ElectronContext)
+ const isMobile = useMediaQuery({ maxWidth: 768 })
+
+ useEffect(() => {
+ if (token) {
+ fetchApiServerVersion().then((version) => {
+ setApiServerVersion(version)
+ })
+ fetchWsServerVersion().then((version) => {
+ setWsServerVersion(version)
+ })
+ }
+ }, [fetchApiServerVersion, fetchWsServerVersion, token])
+
+ useEffect(() => {
+ if (!isElectron) return
+
+ getElectronVersion()
+ .then((version) => {
+ setElectronVersion(version || 'unknown')
+ })
+ .catch(() => {
+ setElectronVersion('unknown')
+ })
+ }, [getElectronVersion, isElectron])
+
+ const [apiServerVersion, setApiServerVersion] = useState(null)
+ const [wsServerVersion, setWsServerVersion] = useState(null)
+ const [electronVersion, setElectronVersion] = useState(null)
+
+ const apiServerVersionText = apiServerVersion ? (
+
+ {`v${apiServerVersion.version}-${apiServerVersion.buildNumber}`}
+
+ ) : (
+
+ )
+ const wsServerVersionText = wsServerVersion ? (
+ {`v${wsServerVersion.version}-${wsServerVersion.buildNumber}`}
+ ) : (
+
+ )
+ const electronVersionText = electronVersion ? (
+ {`v${electronVersion}`}
+ ) : (
+
+ )
+
+ return (
+
+
+
+
+
+
+
+
+ }
+ canCollapse={false}
+ active={collapseState.purchaseOrderStats}
+ onToggle={(isActive) =>
+ updateCollapseState('purchaseOrderStats', isActive)
+ }
+ className='no-t-padding-collapse'
+ collapseKey='purchaseOrderStats'
+ >
+
+ 
+
+
+
+ Farm Control
+
+ {developmentMode && !isMobile && (
+ }
+ >
+ Development
+
+ )}
+
+
+ 3D Printer ERP and Control Software.
+
+
+
+ User Interface:{' '}
+
+ v{appVersion}-{buildNumber}
+
+
+ {isElectron && (
+
+ Electron: {electronVersionText}
+
+ )}
+
+ REST API: {apiServerVersionText}
+
+ Web Socket: {wsServerVersionText}
+
+
+
+ {developmentMode && isMobile && (
+ }
+ >
+ Development
+
+ )}
+
+ Jenkins
+
+
+ GitHub
+
+
+
+
+
+
+