Home Explore Help
Sign In
yunoadmin
/
bambuddy
mirror of https://github.com/maziggy/bambuddy
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #48 from maziggy/0.1.6b5

- Fixed bug in update module for Docker based installations
MartinNYHC 4 months ago
parent
4b5d88436e 32bd11ad82
commit
2e6d8c5ab8
5 changed files with 20 additions and 5 deletions
Unified View Show Diff Stats
  1. 1 1
      backend/app/core/config.py
  2. 3 1
      frontend/src/api/client.ts
  3. 15 2
      frontend/src/pages/SettingsPage.tsx
  4. 0 0
      static/assets/index-8VBiHy5k.js
  5. 1 1
      static/index.html

+ 1 - 1
backend/app/core/config.py
View File 

@@ -5,7 +5,7 @@ from pathlib import Path
 
 from pydantic_settings import BaseSettings
 
 from pydantic_settings import BaseSettings
 
 
 
 # Application version - single source of truth
 
 # Application version - single source of truth
 
-APP_VERSION = "0.1.6b5"
 
+APP_VERSION = "0.1.6b4"
 
 GITHUB_REPO = "maziggy/bambuddy"
 
 GITHUB_REPO = "maziggy/bambuddy"
 
 
 
 # App directory - where the application is installed (for static files)
 
 # App directory - where the application is installed (for static files)

+ 3 - 1
frontend/src/api/client.ts
View File 

@@ -1162,6 +1162,8 @@ export interface UpdateCheckResult {
 
   published_at?: string;
 
   published_at?: string;
 
   error?: string;
 
   error?: string;
 
   message?: string;
 
   message?: string;
 
+  is_docker?: boolean;
 
+  update_method?: 'docker' | 'git';
 
 }
 
 }
 
 
 
 export interface UpdateStatus {
 
 export interface UpdateStatus {
 
@@ -2071,7 +2073,7 @@ export const api = {
 
   getVersion: () => request<VersionInfo>('/updates/version'),
 
   getVersion: () => request<VersionInfo>('/updates/version'),
 
   checkForUpdates: () => request<UpdateCheckResult>('/updates/check'),
 
   checkForUpdates: () => request<UpdateCheckResult>('/updates/check'),
 
   applyUpdate: () =>
 
   applyUpdate: () =>
 
-    request<{ success: boolean; message: string; status: UpdateStatus }>('/updates/apply', {
 
+    request<{ success: boolean; message: string; status?: UpdateStatus; is_docker?: boolean }>('/updates/apply', {
 
       method: 'POST',
 
       method: 'POST',
 
     }),
 
     }),
 
   getUpdateStatus: () => request<UpdateStatus>('/updates/status'),
 
   getUpdateStatus: () => request<UpdateStatus>('/updates/status'),

+ 15 - 2
frontend/src/pages/SettingsPage.tsx
View File 

@@ -215,8 +215,12 @@ export function SettingsPage() {
 
 
 
   const applyUpdateMutation = useMutation({
 
   const applyUpdateMutation = useMutation({
 
     mutationFn: api.applyUpdate,
 
     mutationFn: api.applyUpdate,
 
-    onSuccess: () => {
 
-      refetchUpdateStatus();
 
+    onSuccess: (data) => {
 
+      if (data.is_docker) {
 
+        showToast(data.message, 'error');
 
+      } else {
 
+        refetchUpdateStatus();
 
+      }
 
     },
 
     },
 
   });
 
   });
 
 
 
@@ -1121,6 +1125,15 @@ export function SettingsPage() {
 
                       <div className="mt-3 p-2 bg-red-500/20 rounded text-sm text-red-400">
 
                       <div className="mt-3 p-2 bg-red-500/20 rounded text-sm text-red-400">
 
                         {updateStatus.error || updateStatus.message}
 
                         {updateStatus.error || updateStatus.message}
 
                       </div>
 
                       </div>
 
+                    ) : updateCheck?.is_docker ? (
 
+                      <div className="mt-3 p-3 bg-bambu-dark-tertiary rounded-lg">
 
+                        <p className="text-sm text-bambu-gray mb-2">
 
+                          Update via Docker Compose:
 
+                        </p>
 
+                        <code className="block text-xs bg-bambu-dark p-2 rounded text-bambu-green font-mono">
 
+                          docker compose pull && docker compose up -d
 
+                        </code>
 
+                      </div>
 
                     ) : (
 
                     ) : (
 
                       <Button
 
                       <Button
 
                         className="mt-3"
 
                         className="mt-3"

File diff suppressed because it is too large
+ 0 - 0
static/assets/index-8VBiHy5k.js


+ 1 - 1
static/index.html
View File 

@@ -23,7 +23,7 @@
 
 
 
     <!-- Splash screens for iOS -->
 
     <!-- Splash screens for iOS -->
 
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
 
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
 
-    <script type="module" crossorigin src="/assets/index-BaU_6oPV.js"></script>
 
+    <script type="module" crossorigin src="/assets/index-8VBiHy5k.js"></script>
 
     <link rel="stylesheet" crossorigin href="/assets/index-Da3qKIoX.css">
 
     <link rel="stylesheet" crossorigin href="/assets/index-Da3qKIoX.css">
 
   </head>
 
   </head>
 
   <body>
 
   <body>

Some files were not shown because too many files changed in this diff