fix ntfy

.gitea/workflows/deploy.yml

@@ -13,35 +13,33 @@ jobs:
 
       - name: Build Docker image
         run: |
-          npm ci
-          npm run build
+          docker build -t timelapse-calc:latest \
+            -f Dockerfile .
 
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-output
-          path: dist/
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-    container:
-      image: node:20-slim
-      options: -v /var/www/vite-app:/deploy/vite-app --user 1000:1000
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: build-output
-          path: dist/
-
-      - name: Deploy to host
+      - name: Stop old container if exists
         run: |
-          rm -rf /deploy/vite-app/timelapse-calc
-          mkdir -p /deploy/vite-app/timelapse-calc
-          cp -r dist/* /deploy/vite-app/timelapse-calc/
-          echo "Deployment completed successfully"
-          echo "Deployed files:"
-          ls -la /deploy/vite-app/timelapse-calc/
+          if docker ps -a --format '{{.Names}}' | grep -q '^timelapse-calc$'; then
+            docker stop timelapse-calc
+            docker rm timelapse-calc
+          fi
+
+      - name: Run new container
+        run: |
+          docker run -d \
+            --restart always \
+            --name timelapse-calc \
+            -p 3005:80 \
+            timelapse-calc:latest
+
+      - name: Send Deployment Notification
+        uses: https://git.hcmc.online/actions/deploy-notify@main
+        if: always()
+        with:
+          status: ${{ job.status }}
+          title: "Deploy: ${{ github.repository }}"
+          message: |
+            Ref: ${{ github.ref_name }}
+            Commit: ${{ github.sha }}
+            Message: ${{ github.event.head_commit.message }}
+            Status: ${{ job.status }}
+            Actor: ${{ github.event.head_commit.author.name }}

src/App.jsx

@@ -1,5 +1,5 @@
-import { useState, useEffect } from 'react';
-import { Card, ConfigProvider } from 'antd';
+import { useState } from 'react';
+import { Card, ConfigProvider, Segmented } from 'antd';
 import Header from './components/Header';
 import CalculatorMode from './components/CalculatorMode';
 import TimeInput from './components/TimeInput';
@@ -13,43 +13,56 @@ function App() {
 
   // State for inputs
   const [clipLength, setClipLength] = useState({ hours: 0, minutes: 0, seconds: 20 });
-  const [eventDuration, setEventDuration] = useState({ hours: 1, minutes: 0, seconds: 0 });
+  const [eventDuration, setEventDuration] = useState({ hours: 0, minutes: 40, seconds: 0 });
+  const [intervalInput, setIntervalInput] = useState(2); // Seconds
   const [fps, setFps] = useState(30);
-  const [imageSize, setImageSize] = useState(12);
-
-  // State for results
-  const [shootingInterval, setShootingInterval] = useState(0);
-  const [numberOfPhotos, setNumberOfPhotos] = useState(0);
-  const [totalMemory, setTotalMemory] = useState(0);
 
   // Helper function to convert time object to seconds
   const timeToSeconds = (time) => {
     return time.hours * 3600 + time.minutes * 60 + time.seconds;
   };
 
-  // Calculate results whenever inputs change
-  useEffect(() => {
-    const clipSeconds = timeToSeconds(clipLength);
-    const eventSeconds = timeToSeconds(eventDuration);
+  // Helper to convert seconds to time object (for derived values if needed, but we output seconds)
+  // ...
 
-    if (clipSeconds > 0 && eventSeconds > 0 && fps > 0) {
-      // Calculate shooting interval (in seconds)
-      const interval = eventSeconds / (clipSeconds * fps);
-      setShootingInterval(interval);
+  // Calculate results
+  const calculateResults = () => {
+    const clipSec = timeToSeconds(clipLength);
+    const eventSec = timeToSeconds(eventDuration);
 
-      // Calculate number of photos
-      const photos = Math.ceil(eventSeconds / interval);
-      setNumberOfPhotos(photos);
+    let photos = 0;
+    let result = 0;
 
-      // Calculate total memory (in MB)
-      const memory = photos * imageSize;
-      setTotalMemory(memory);
-    } else {
-      setShootingInterval(0);
-      setNumberOfPhotos(0);
-      setTotalMemory(0);
+    if (mode === 'shooting-interval') {
+      if (clipSec > 0 && fps > 0) {
+        result = eventSec / (clipSec * fps);
+        if (result > 0) photos = Math.ceil(eventSec / result);
+      }
+    } else if (mode === 'clip-length') {
+      if (intervalInput > 0 && fps > 0) {
+        result = eventSec / (intervalInput * fps);
+        photos = Math.ceil(eventSec / intervalInput);
+      }
+    } else if (mode === 'event-duration') {
+      if (clipSec > 0 && intervalInput > 0 && fps > 0) {
+        result = clipSec * fps * intervalInput;
+        photos = Math.ceil(result / intervalInput);
+      }
     }
-  }, [clipLength, eventDuration, fps, imageSize]);
+
+    return { resultSeconds: result, numberOfPhotos: photos };
+  };
+
+  const { resultSeconds, numberOfPhotos } = calculateResults();
+
+  const getResultLabel = () => {
+    switch (mode) {
+      case 'shooting-interval': return "Shooting Interval";
+      case 'clip-length': return "Clip Length";
+      case 'event-duration': return "Event Duration";
+      default: return "Result";
+    }
+  };
 
   return (
     <ConfigProvider
@@ -68,6 +81,11 @@ function App() {
           InputNumber: {
             controlHeight: 44,
           },
+          Segmented: {
+            itemSelectedBg: '#F4D03F',
+            itemSelectedColor: '#2C3E50',
+            trackBg: '#F8F9FA'
+          }
         },
       }}
     >
@@ -77,44 +95,62 @@ function App() {
           <Card className="calculator-card">
             <CalculatorMode value={mode} onChange={setMode} />
 
-            <TimeInput
-              label="Clip length"
-              hours={clipLength.hours}
-              minutes={clipLength.minutes}
-              seconds={clipLength.seconds}
-              onChange={setClipLength}
-            />
+            {mode !== 'clip-length' && (
+              <TimeInput
+                label="Clip length"
+                hours={clipLength.hours}
+                minutes={clipLength.minutes}
+                seconds={clipLength.seconds}
+                onChange={setClipLength}
+              />
+            )}
 
-            <TimeInput
-              label="Event duration"
-              hours={eventDuration.hours}
-              minutes={eventDuration.minutes}
-              seconds={eventDuration.seconds}
-              onChange={setEventDuration}
-            />
+            {mode !== 'event-duration' && (
+              <TimeInput
+                label="Event duration"
+                hours={eventDuration.hours}
+                minutes={eventDuration.minutes}
+                seconds={eventDuration.seconds}
+                onChange={setEventDuration}
+              />
+            )}
 
-            <NumberInput
-              label="Frames per second"
-              value={fps}
-              onChange={setFps}
-              unit="fps"
-              min={1}
-              step={1}
-            />
+            {mode !== 'shooting-interval' && (
+              <NumberInput
+                label="Shooting Interval (sec)"
+                value={intervalInput}
+                onChange={setIntervalInput}
+                unit="s"
+                min={0.1}
+                step={0.1}
+              />
+            )}
 
-            <NumberInput
-              label="Image size"
-              value={imageSize}
-              onChange={setImageSize}
-              unit="MB"
-              min={0.1}
-              step={0.1}
-            />
+            <div className="form-row">
+              <label className="form-label">Frames per second</label>
+              <Segmented
+                options={[
+                  { label: '24', value: 24 },
+                  { label: '30', value: 30 },
+                  { label: '60', value: 60 },
+                ]}
+                value={fps}
+                onChange={setFps}
+                block
+                size="large"
+                style={{
+                  backgroundColor: '#F8F9FA',
+                  padding: 4,
+                  borderRadius: 8,
+                  border: '1px solid #DEE2E6'
+                }}
+              />
+            </div>
 
             <Results
-              shootingInterval={shootingInterval}
+              label={getResultLabel()}
+              resultSeconds={resultSeconds}
               numberOfPhotos={numberOfPhotos}
-              totalMemory={totalMemory}
             />
           </Card>
         </div>

src/components/CalculatorMode.jsx

@@ -1,22 +1,27 @@
-import { Select } from 'antd';
+import { Segmented } from 'antd';
 
 export default function CalculatorMode({ value, onChange }) {
     return (
         <div className="form-row">
-            <label htmlFor="calculator-mode" className="form-label">
+            <label className="form-label" style={{ display: 'block', marginBottom: 8 }}>
                 Calculate
             </label>
-            <Select
-                id="calculator-mode"
+            <Segmented
                 value={value}
                 onChange={onChange}
+                block
                 size="large"
-                style={{ width: '100%' }}
                 options={[
-                    { value: 'shooting-interval', label: 'Shooting interval' },
-                    { value: 'clip-length', label: 'Clip length' },
-                    { value: 'event-duration', label: 'Event duration' },
+                    { value: 'shooting-interval', label: 'Interval' },
+                    { value: 'clip-length', label: 'Clip' },
+                    { value: 'event-duration', label: 'Event' },
                 ]}
+                style={{
+                    backgroundColor: '#F8F9FA',
+                    padding: 4,
+                    borderRadius: 8,
+                    border: '1px solid #DEE2E6'
+                }}
             />
         </div>
     );

src/components/NumberInput.jsx

@@ -1,4 +1,4 @@
-import { InputNumber } from 'antd';
+import { InputNumber, Button, Flex } from 'antd';
 
 export default function NumberInput({ label, value, onChange, unit, min = 0, step = 1 }) {
     const handleChange = (newValue) => {
@@ -6,20 +6,45 @@ export default function NumberInput({ label, value, onChange, unit, min = 0, ste
         onChange(numValue);
     };
 
+    const handleDecrement = () => {
+        handleChange(value - step);
+    };
+
+    const handleIncrement = () => {
+        handleChange(value + step);
+    };
+
     return (
         <div className="form-row">
             <label className="form-label">{label}</label>
-            <InputNumber
-                value={value}
-                onChange={handleChange}
-                min={min}
-                step={step}
-                placeholder="0"
-                addonAfter={unit}
-                size="large"
-                style={{ width: '100%' }}
-                controls={false}
-            />
+            <Flex gap="small">
+                <Button
+                    onClick={handleDecrement}
+                    size="large"
+                    disabled={value <= min}
+                    style={{ width: 44, padding: 0 }}
+                >
+                    -
+                </Button>
+                <InputNumber
+                    value={value}
+                    onChange={handleChange}
+                    min={min}
+                    step={step}
+                    placeholder="0"
+                    suffix={<span style={{ color: '#999' }}>{unit}</span>}
+                    size="large"
+                    style={{ flex: 1 }}
+                    controls={false}
+                />
+                <Button
+                    onClick={handleIncrement}
+                    size="large"
+                    style={{ width: 44, padding: 0 }}
+                >
+                    +
+                </Button>
+            </Flex>
         </div>
     );
 }

src/components/Results.jsx

@@ -1,9 +1,11 @@
 import { Statistic, Row, Col } from 'antd';
 
-export default function Results({ shootingInterval, numberOfPhotos, totalMemory }) {
+export default function Results({ label, resultSeconds, numberOfPhotos }) {
     const formatTime = (seconds) => {
+        if (!seconds) return '0s';
         if (seconds < 60) {
-            return `${seconds.toFixed(0)}s`;
+            // For interval, we might want decimals. For others, maybe not strictly required but harmless.
+            return `${parseFloat(seconds.toFixed(1))}s`;
         } else if (seconds < 3600) {
             const mins = Math.floor(seconds / 60);
             const secs = Math.floor(seconds % 60);
@@ -16,38 +18,23 @@ export default function Results({ shootingInterval, numberOfPhotos, totalMemory
         }
     };
 
-    const formatMemory = (mb) => {
-        if (mb < 1024) {
-            return `${mb.toFixed(2)}MB`;
-        } else {
-            return `${(mb / 1024).toFixed(2)}GB`;
-        }
-    };
-
     return (
         <div className="results-section">
             <Row gutter={[16, 16]}>
-                <Col xs={24} sm={8}>
+                <Col xs={24} sm={12}>
                     <Statistic
-                        title="Shooting interval"
-                        value={formatTime(shootingInterval)}
+                        title={label}
+                        value={formatTime(resultSeconds)}
                         valueStyle={{ color: '#2C3E50', fontSize: '1.5rem', fontWeight: 600 }}
                     />
                 </Col>
-                <Col xs={24} sm={8}>
+                <Col xs={24} sm={12}>
                     <Statistic
                         title="Number of photos"
                         value={numberOfPhotos}
                         valueStyle={{ color: '#2C3E50', fontSize: '1.5rem', fontWeight: 600 }}
                     />
                 </Col>
-                <Col xs={24} sm={8}>
-                    <Statistic
-                        title="Total memory usage"
-                        value={formatMemory(totalMemory)}
-                        valueStyle={{ color: '#2C3E50', fontSize: '1.5rem', fontWeight: 600 }}
-                    />
-                </Col>
             </Row>
         </div>
     );

src/components/TimeInput.jsx

@@ -20,7 +20,7 @@ export default function TimeInput({ label, hours, minutes, seconds, onChange })
                     onChange={(value) => handleChange('hours', value)}
                     min={0}
                     placeholder="0"
-                    addonAfter="h"
+                    suffix={<span style={{ color: '#999' }}>h</span>}
                     size="large"
                     style={{ width: '33.33%' }}
                     controls={false}
@@ -31,7 +31,7 @@ export default function TimeInput({ label, hours, minutes, seconds, onChange })
                     min={0}
                     max={59}
                     placeholder="0"
-                    addonAfter="m"
+                    suffix={<span style={{ color: '#999' }}>m</span>}
                     size="large"
                     style={{ width: '33.33%' }}
                     controls={false}
@@ -42,7 +42,7 @@ export default function TimeInput({ label, hours, minutes, seconds, onChange })
                     min={0}
                     max={59}
                     placeholder="0"
-                    addonAfter="s"
+                    suffix={<span style={{ color: '#999' }}>s</span>}
                     size="large"
                     style={{ width: '33.34%' }}
                     controls={false}