Show app version (v2.2.0) in user menu
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import React, { useState } from 'react'
|
import React, { useState, useEffect } from 'react'
|
||||||
import { Link, useNavigate } from 'react-router-dom'
|
import { Link, useNavigate } from 'react-router-dom'
|
||||||
import { useAuthStore } from '../../store/authStore'
|
import { useAuthStore } from '../../store/authStore'
|
||||||
import { useSettingsStore } from '../../store/settingsStore'
|
import { useSettingsStore } from '../../store/settingsStore'
|
||||||
@@ -11,8 +11,15 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
|
|||||||
const { t, locale } = useTranslation()
|
const { t, locale } = useTranslation()
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const [userMenuOpen, setUserMenuOpen] = useState(false)
|
const [userMenuOpen, setUserMenuOpen] = useState(false)
|
||||||
|
const [appVersion, setAppVersion] = useState(null)
|
||||||
const dark = settings.dark_mode
|
const dark = settings.dark_mode
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
import('../../api/client').then(({ authApi }) => {
|
||||||
|
authApi.getAppConfig?.().then(c => setAppVersion(c?.version)).catch(() => {})
|
||||||
|
})
|
||||||
|
}, [])
|
||||||
|
|
||||||
const handleLogout = () => {
|
const handleLogout = () => {
|
||||||
logout()
|
logout()
|
||||||
navigate('/login')
|
navigate('/login')
|
||||||
@@ -146,6 +153,11 @@ export default function Navbar({ tripTitle, tripId, onBack, showBack, onShare })
|
|||||||
<LogOut className="w-4 h-4" />
|
<LogOut className="w-4 h-4" />
|
||||||
{t('nav.logout')}
|
{t('nav.logout')}
|
||||||
</button>
|
</button>
|
||||||
|
{appVersion && (
|
||||||
|
<div className="px-4 py-1.5 text-center" style={{ fontSize: 10, color: 'var(--text-faint)' }}>
|
||||||
|
NOMAD v{appVersion}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</>
|
</>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nomad-server",
|
"name": "nomad-server",
|
||||||
"version": "2.0.0",
|
"version": "2.2.0",
|
||||||
"main": "src/index.js",
|
"main": "src/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "node --experimental-sqlite src/index.js",
|
"start": "node --experimental-sqlite src/index.js",
|
||||||
|
|||||||
@@ -66,9 +66,11 @@ router.get('/app-config', (req, res) => {
|
|||||||
const setting = db.prepare("SELECT value FROM app_settings WHERE key = 'allow_registration'").get();
|
const setting = db.prepare("SELECT value FROM app_settings WHERE key = 'allow_registration'").get();
|
||||||
const allowRegistration = userCount === 0 || (setting?.value ?? 'true') === 'true';
|
const allowRegistration = userCount === 0 || (setting?.value ?? 'true') === 'true';
|
||||||
const isDemo = process.env.DEMO_MODE === 'true';
|
const isDemo = process.env.DEMO_MODE === 'true';
|
||||||
|
const { version } = require('../../package.json');
|
||||||
res.json({
|
res.json({
|
||||||
allow_registration: isDemo ? false : allowRegistration,
|
allow_registration: isDemo ? false : allowRegistration,
|
||||||
has_users: userCount > 0,
|
has_users: userCount > 0,
|
||||||
|
version,
|
||||||
demo_mode: isDemo,
|
demo_mode: isDemo,
|
||||||
demo_email: isDemo ? 'demo@nomad.app' : undefined,
|
demo_email: isDemo ? 'demo@nomad.app' : undefined,
|
||||||
demo_password: isDemo ? 'demo12345' : undefined,
|
demo_password: isDemo ? 'demo12345' : undefined,
|
||||||
|
|||||||
Reference in New Issue
Block a user