Compare commits

...

7 Commits

Author SHA1 Message Date
Viktor Rådberg
f94103fe51 fix 2024-01-13 20:20:50 +01:00
Viktor Rådberg
c36668b933 fix 2024-01-13 20:20:20 +01:00
Viktor Rådberg
f9d0346300 bump 2024-01-13 20:18:50 +01:00
Viktor Rådberg
2f3ee74c74 test 2024-01-13 20:15:43 +01:00
Viktor Rådberg
f8f0788b97 bump 2024-01-13 19:53:02 +01:00
Viktor Rådberg
bfe25eacb7 fix lint 2024-01-13 19:44:27 +01:00
Viktor Rådberg
7b0965c0dd test release 2024-01-13 19:40:36 +01:00
2 changed files with 12 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
{ {
"name": "life-trinket", "name": "life-trinket",
"private": true, "private": true,
"version": "0.5.4", "version": "0.5.43",
"type": "commonjs", "type": "commonjs",
"engines": { "engines": {
"node": ">=18", "node": ">=18",

View File

@@ -4,7 +4,7 @@ import { useGlobalSettings } from '../../Hooks/useGlobalSettings';
import { ModalWrapper } from './InfoModal'; import { ModalWrapper } from './InfoModal';
import { Separator } from './Separator'; import { Separator } from './Separator';
import { Paragraph } from './TextComponents'; import { Paragraph } from './TextComponents';
import { useEffect, useRef, useState } from 'react'; import { useEffect, useState } from 'react';
const SettingContainer = twc.div`w-full flex flex-col`; const SettingContainer = twc.div`w-full flex flex-col`;
@@ -22,7 +22,7 @@ type SettingsModalProps = {
export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => { export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
const { settings, setSettings, isPWA } = useGlobalSettings(); const { settings, setSettings, isPWA } = useGlobalSettings();
const [isLatestVersion, setIsLatestVersion] = useState(false); const [isLatestVersion, setIsLatestVersion] = useState(false);
const newVersion = useRef<string | undefined>(undefined); const [newVersion, setNewVersion] = useState<string | undefined>(undefined);
useEffect(() => { useEffect(() => {
if (!isOpen) { if (!isOpen) {
@@ -43,18 +43,22 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
); );
const data = await result.json(); const data = await result.json();
console.info('liveVersion', data.name);
if (!data.name) { if (!data.name) {
setNewVersion(undefined);
setIsLatestVersion(false); setIsLatestVersion(false);
newVersion.current = undefined;
return; return;
} }
setNewVersion(data.name);
/* @ts-expect-error is defined in vite.config.ts*/ /* @ts-expect-error is defined in vite.config.ts*/
if (data.name === APP_VERSION) { if (data.name === APP_VERSION) {
newVersion.current = data.name;
setIsLatestVersion(true); setIsLatestVersion(true);
return; return;
} }
setIsLatestVersion(false); setIsLatestVersion(false);
} catch (error) { } catch (error) {
console.error('error getting latest version string', error); console.error('error getting latest version string', error);
@@ -147,13 +151,13 @@ export const SettingsModal = ({ isOpen, closeModal }: SettingsModalProps) => {
<span className="text-sm text-text-secondary">(latest)</span> <span className="text-sm text-text-secondary">(latest)</span>
)} )}
</Paragraph> </Paragraph>
{!isLatestVersion && newVersion.current && ( {!isLatestVersion && newVersion && (
<Paragraph className="text-text-secondary text-lg text-center"> <Paragraph className="text-text-secondary text-lg text-center">
New version ({newVersion.current}) is available!{' '} New version ({newVersion}) is available!{' '}
</Paragraph> </Paragraph>
)} )}
</SettingContainer> </SettingContainer>
{!isLatestVersion && newVersion.current && ( {!isLatestVersion && newVersion && (
<Button <Button
variant="contained" variant="contained"
style={{ marginTop: '0.25rem', marginBottom: '0.25rem' }} style={{ marginTop: '0.25rem', marginBottom: '0.25rem' }}