Merge pull request #288 from yohamta/feat/add-version

admin-web: add version display
dagu-org · Aug 22, 2022 · 34e7d28 · 34e7d28
2 parents 95c70d3 + aca47c3
commit 34e7d28
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/admin/index.html b/admin/index.html
@@ -10,6 +10,7 @@
         return {
           title: '',
           navbarColor: '',
+          version: '',
         };
       }
     </script>

diff --git a/admin/src/App.tsx b/admin/src/App.tsx
@@ -11,6 +11,7 @@ import fetchJson from './lib/fetchJson';
 export type Config = {
   title: string;
   navbarColor: string;
+  version: string;
 };
 
 type Props = {

diff --git a/admin/src/Layout.tsx b/admin/src/Layout.tsx
@@ -65,22 +65,28 @@ const Drawer = styled(MuiDrawer, {
 const mdTheme = createTheme({
   typography: {
     fontFamily:
-    "'SF Pro Display','SF Compact Display',-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'",
+      "'SF Pro Display','SF Compact Display',-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol'",
   },
   palette: {
     primary: {
       main: '#485fc7',
-    }
+    },
   },
 });
 
 type DashboardContentProps = {
   title: string;
   navbarColor: string;
+  version: string;
   children?: React.ReactElement | React.ReactElement[];
 };
 
-function Content({ title, navbarColor, children }: DashboardContentProps) {
+function Content({
+  title,
+  navbarColor,
+  version,
+  children,
+}: DashboardContentProps) {
   const [open, setOpen] = React.useState(false);
   const toggleDrawer = () => {
     setOpen(!open);
@@ -118,6 +124,17 @@ function Content({ title, navbarColor, children }: DashboardContentProps) {
                 />
               </IconButton>
             </Toolbar>
+            <Box
+              sx={{
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+                color: '#fff',
+                overflowWrap: 'break-word',
+              }}
+            >
+              {version}
+            </Box>
             <List
               component="nav"
               sx={{

diff --git a/internal/admin/handlers/web/templates/base.gohtml b/internal/admin/handlers/web/templates/base.gohtml
@@ -13,6 +13,7 @@
       return {
         title: "{{ navbarTitle }}",
         navbarColor: "{{ navbarColor }}",
+        version: "{{ version }}",
       }
     }
   </script>