tmp

.github/workflows/deploy.yml

@@ -42,7 +42,7 @@ jobs:
           cmd: build # will run `yarn build` command (for each os)
           dir: desktop-app
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.platform }}-distributables
           path: desktop-app/dist/Napse-*
@@ -57,7 +57,7 @@ jobs:
           ref: ${{ github.event.release.target_commitish }}
 
       - name: Get all distributables
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Get distributables
         run: |
@@ -78,7 +78,7 @@ jobs:
           echo "VERSION=$VERSION" >> $GITHUB_ENV
 
       - name: Publish all artifacts to GitHub Releases
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${{ env.VERSION }}

.gitignore

@@ -11,7 +11,7 @@ pids
 *.seed
 *.pid.lock
 
-# Directory for instrumented libs generated by jscoverage/JSCover
+# Directory for instrumented libs generated by jscoverage/JSCover 
 lib-cov
 
 # Coverage directory used by tools like istanbul

desktop-app/main/background.ts

@@ -1,5 +1,5 @@
 import { EnvironmentStatus } from '@aws-sdk/client-elastic-beanstalk'
-import { BrowserWindow, app, ipcMain } from 'electron'
+import { BrowserWindow, app, autoUpdater, dialog, ipcMain } from 'electron'
 import serve from 'electron-serve'
 import {
   EB_APP_NAME,
@@ -25,34 +25,34 @@ if (isProd) {
 ;(async () => {
   await app.whenReady()
 
-  // if (isProd) {
-  //   const server = 'https://hazel-c8oqh794d-napse-investment.vercel.app/'
-  //   const url = `${server}/update/${process.platform}/${app.getVersion()}`
+  if (isProd) {
+    const server = 'https://hazel-c8oqh794d-napse-investment.vercel.app/'
+    const url = `${server}/update/${process.platform}/${app.getVersion()}`
 
-  //   autoUpdater.setFeedURL({ url })
-  //   setInterval(() => {
-  //     autoUpdater.checkForUpdates()
-  //   }, 60000)
-  //   autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
-  //     const dialogOpts = {
-  //       type: 'info',
-  //       buttons: ['Restart', 'Later'],
-  //       title: 'Application Update',
-  //       message: process.platform === 'win32' ? releaseNotes : releaseName,
-  //       detail:
-  //         'A new version has been downloaded. Restart the application to apply the updates.'
-  //     }
+    autoUpdater.setFeedURL({ url })
+    setInterval(() => {
+      autoUpdater.checkForUpdates()
+    }, 60000)
+    autoUpdater.on('update-downloaded', (event, releaseNotes, releaseName) => {
+      const dialogOpts = {
+        type: 'info',
+        buttons: ['Restart', 'Later'],
+        title: 'Application Update',
+        message: process.platform === 'win32' ? releaseNotes : releaseName,
+        detail:
+          'A new version has been downloaded. Restart the application to apply the updates.'
+      }
 
-  //     dialog.showMessageBox(dialogOpts).then((returnValue) => {
-  //       if (returnValue.response === 0) autoUpdater.quitAndInstall()
-  //     })
-  //     console.log('update-downloaded')
-  //   })
-  //   autoUpdater.on('error', (message) => {
-  //     console.error('There was a problem updating the application')
-  //     console.error(message)
-  //   })
-  // }
+      dialog.showMessageBox(dialogOpts).then((returnValue) => {
+        if (returnValue.response === 0) autoUpdater.quitAndInstall()
+      })
+      console.log('update-downloaded')
+    })
+    autoUpdater.on('error', (message) => {
+      console.error('There was a problem updating the application')
+      console.error(message)
+    })
+  }
 
   const mainWindow = createWindow('main', {
     width: 1000,

desktop-app/package.json

@@ -19,11 +19,12 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@aws-sdk/client-ec2": "^3.515.0",
-    "@aws-sdk/client-elastic-beanstalk": "^3.484.0",
+    "@babel/traverse": "^7.24.1",
+    "@aws-sdk/client-ec2": "^3.537.0",
+    "@aws-sdk/client-elastic-beanstalk": "^3.567.0",
     "@aws-sdk/client-iam": "^3.485.0",
     "@aws-sdk/client-s3": "^3.484.0",
-    "@aws-sdk/client-secrets-manager": "^3.485.0",
+    "@aws-sdk/client-secrets-manager": "^3.535.0",
     "@aws-sdk/client-sts": "^3.485.0",
     "@heroicons/react": "^2.0.18",
     "@hookform/resolvers": "^3.3.4",
@@ -46,61 +47,61 @@
     "@radix-ui/react-tabs": "^1.0.4",
     "@radix-ui/react-toast": "^1.1.4",
     "@radix-ui/react-tooltip": "^1.0.6",
-    "@reduxjs/toolkit": "^1.9.5",
-    "@tanstack/react-table": "^8.13.0",
-    "@tremor/react": "^3.9.2",
+    "@reduxjs/toolkit": "^2.2.1",
+    "@tanstack/react-table": "^8.16.0",
+    "@tremor/react": "^3.14.1",
     "add": "^2.0.6",
-    "axios": "^1.5.0",
+    "axios": "^1.6.8",
     "class-variance-authority": "^0.7.0",
-    "clsx": "^2.0.0",
+    "clsx": "^2.1.0",
     "cmdk": "^0.2.1",
-    "date-fns": "^3.3.1",
+    "date-fns": "^3.6.0",
     "electron-dl": "^3.5.1",
     "electron-serve": "^1.1.0",
-    "electron-store": "^8.1.0",
+    "electron-store": "^8.2.0",
     "embla-carousel-react": "^8.0.0-rc20",
     "extract-zip": "^2.0.1",
     "fs": "^0.0.1-security",
     "https": "^1.0.0",
-    "lucide-react": "^0.344.0",
-    "next-themes": "^0.2.1",
+    "lucide-react": "^0.363.0",
+    "next-themes": "^0.3.0",
     "react-day-picker": "^8.10.0",
-    "react-hook-form": "^7.47.0",
-    "react-redux": "^8.1.2",
+    "react-hook-form": "^7.51.1",
+    "react-redux": "^9.1.0",
     "redaxios": "^0.5.1",
     "separator": "^0.1.0",
-    "shadcn-ui": "^0.4.1",
-    "sonner": "^1.4.3",
+    "shadcn-ui": "^0.8.0",
+    "sonner": "^1.4.41",
     "superagent": "^8.1.2",
-    "table": "^6.8.1",
+    "table": "^6.8.2",
     "tabs": "^0.2.0",
-    "tailwind-merge": "^1.14.0",
+    "tailwind-merge": "^2.3.0",
     "tailwindcss-animate": "^1.0.6",
     "toast": "^0.5.4",
     "zlib": "^1.0.5",
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@types/node": "^20.8.5",
+    "@types/node": "^20.8.6",
     "@types/prop-types": "^15.7.8",
     "@types/react": "^18.2.28",
     "@typescript-eslint/eslint-plugin": "^6.17.0",
     "@typescript-eslint/parser": "^6.16.0",
-    "autoprefixer": "^10.4.7",
-    "electron": "^21.4.4",
+    "autoprefixer": "^10.4.19",
+    "electron": "^29.1.4",
     "electron-builder": "^24.13.3",
     "eslint": "^8.57.0",
     "eslint-config-next": "13.5.4",
     "eslint-config-standard-with-typescript": "^39.1.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react": "^7.34.1",
     "eslint-plugin-tailwind": "^0.2.1",
     "eslint-plugin-tailwindcss": "^3.13.0",
     "next": "^13.5.5",
-    "nextron": "^8.12.0",
-    "postcss": "^8.4.13",
+    "nextron": "^8.13.0",
+    "postcss": "^8.4.37",
     "prettier": "^3.0.2",
     "prettier-plugin-organize-imports": "^3.2.3",
     "prettier-plugin-tailwindcss": "^0.5.3",

desktop-app/renderer/components/custom/moneyActions/fleetMoneyActionButtons.tsx

@@ -22,7 +22,6 @@ export default function FleetMoneyActionButtons({
 }: {
   fleet: RetrievedFleet
 }): JSX.Element {
-  console.log('fleet::', fleet)
   return (
     <>
       {fleet.testing && (

desktop-app/renderer/lib/localStorage.ts

@@ -24,7 +24,6 @@ function addServer(
 }
 
 function updateServer(server: Server) {
-  console.log(server)
   if (typeof window !== 'undefined') {
     if (!localStorage.servers) {
       localStorage.servers = JSON.stringify({})
@@ -35,7 +34,6 @@ function updateServer(server: Server) {
       url: server.url,
       token: server.token
     }
-    console.log(servers)
     localStorage.servers = JSON.stringify(servers)
   }
 }

desktop-app/renderer/pages/fleets/createFleetDialog.tsx

@@ -86,7 +86,8 @@ export default function CreateFleetDialog({
 
   const defaultValues = {
     name: 'Fleet Name',
-    space: Object.keys(napseSpacePossibilitiesSelection)[0]
+    space: searchParams.get('space') as string
+    // space: Object.keys(napseSpacePossibilitiesSelection)[0]
   }
 
   const form = useForm<z.infer<typeof FleetSchema>>({
@@ -119,7 +120,7 @@ export default function CreateFleetDialog({
         space: values.space,
         clusters: Clusters
       }
-      console.log('fleetData::', fleetData)
+      console.log('fleetData::', values.space)
 
       const response = await createFleet(searchParams, fleetData)
       setFleets([...fleets, response.data])

desktop-app/renderer/pages/servers/index.tsx

@@ -2,8 +2,10 @@ import { connectKey } from '@/api/key/key'
 import InfoPanelCard from '@/components/custom/panel/infoPanelCard'
 import ContextHeader from '@/components/layout/contextHeader'
 import DefaultPageLayout from '@/components/layout/defaultPageLayout'
+import fs from 'fs'
+import path from 'path'
 
-import { Server, getServers } from '@/lib/localStorage'
+import { Server, getServers, updateServer } from '@/lib/localStorage'
 import { standardUrlPartial } from '@/lib/queryParams'
 import { useSearchParams } from 'next/navigation'
 import { useRouter } from 'next/router'
@@ -63,6 +65,25 @@ export default function Servers(): JSX.Element {
     ).then(setCards)
   }, [servers, router, searchParams])
 
+  useEffect(() => {
+    if (process.env.NODE_ENV === 'production') return
+    const rootPath = process.env.HOME || process.env.USERPROFILE
+    if (!rootPath) throw new Error('No root path found')
+
+    const filePath = path.join(rootPath, '.napse-dev', 'api-keys.json')
+    const dirPath = path.dirname(filePath)
+    if (!fs.existsSync(dirPath)) {
+      return
+    }
+    const file = fs.readFileSync(filePath, 'utf8')
+    const data = JSON.parse(file)
+    // iterate over keys and values
+    Object.keys(data).forEach((key) => {
+      const server = data[key]
+      updateServer({ name: key, url: server.url, token: server.token })
+    })
+  }, [])
+
   return (
     <ContextHeader isServer>
       <DefaultPageLayout

desktop-app/renderer/pages/settings/index.tsx

@@ -417,10 +417,10 @@ export default function Settings(): JSX.Element {
                       {!isDeployed
                         ? 'Warning: No server deployed'
                         : !isReadyToUpdate
-                        ? 'Warning: Server not ready'
-                        : !hasAvailableUpdate
-                        ? 'Warning: No updates available'
-                        : ''}
+                          ? 'Warning: Server not ready'
+                          : !hasAvailableUpdate
+                            ? 'Warning: No updates available'
+                            : ''}
                     </div>
                   </CardHeader>
                   <CardContent className="flex flex-col items-center justify-center">
@@ -473,8 +473,8 @@ export default function Settings(): JSX.Element {
                       {!isDeployed
                         ? 'Warning: No server deployed'
                         : !isReadyToUpdate
-                        ? 'Warning: Server not ready'
-                        : ''}
+                          ? 'Warning: Server not ready'
+                          : ''}
                     </div>
                   </CardHeader>
 
@@ -518,8 +518,8 @@ export default function Settings(): JSX.Element {
                       {!isDeployed
                         ? 'Warning: No server deployed'
                         : !isReadyToUpdate
-                        ? 'Warning: Server not ready'
-                        : ''}
+                          ? 'Warning: Server not ready'
+                          : ''}
                     </div>
                   </CardHeader>
                   <CardContent className="flex flex-col items-center justify-center">