Merge pull request #209 from napse-invest/dev

fix(exchangeAccount): create fixed
napse-invest · Mar 12, 2024 · 4d24339 · 4d24339
2 parents 6cddcbf + b91ff7e
commit 4d24339
Show file tree

Hide file tree

Showing 18 changed files with 218 additions and 84 deletions.
diff --git a/desktop-app/.prettierrc b/desktop-app/.prettierrc
@@ -6,6 +6,6 @@
   "semi": false,
   "plugins": [
     "prettier-plugin-tailwindcss",
-    "prettier-plugin-organize-imports"  
+    "prettier-plugin-organize-imports"
   ]
 }
diff --git a/desktop-app/electron-builder.yml b/desktop-app/electron-builder.yml
@@ -1,5 +1,5 @@
 appId: com.example.nextron
-productName: My Nextron App
+productName: Napse
 copyright: Copyright © 2018 Yoshihide Shiono
 directories:
   output: dist
@@ -10,8 +10,4 @@ files:
       - package.json
       - app
 
-linux:
-  target: deb
-  icon: renderer/public/images/logo.svg
-
 publish: null
diff --git a/desktop-app/main/background.ts b/desktop-app/main/background.ts
@@ -37,7 +37,7 @@ if (isProd) {
   })
   ipcMain.handle('fullCleanupAWS', async (event, args) => {
     if (args.secrets) {
-      return await fullCleanupAWS(args.secrets, mainWindow)
+      return await fullCleanupAWS(args.secrets, args.deleteData, mainWindow)
     }
   })
   ipcMain.handle('updateAWS', async (event, args) => {
@@ -83,9 +83,12 @@ if (isProd) {
         EB_APP_NAME,
         EB_ENV_NAME
       )
-      if (environments) {
+      if (environments && environments.length > 0) {
         for (const env of environments) {
-          if (env.Status != EnvironmentStatus.Ready) {
+          if (
+            env.Status != EnvironmentStatus.Terminated &&
+            env.Status != EnvironmentStatus.Ready
+          ) {
             allReady = false
             break
           }

diff --git a/desktop-app/main/helpers/aws/deployToAWS.ts b/desktop-app/main/helpers/aws/deployToAWS.ts
@@ -20,14 +20,27 @@ import {
 } from 'main/helpers'
 import path from 'path'
 
-export const EB_BUCKET_NAME = 'napse-eb-bucket'
-export const EB_APP_NAME = 'napse'
+export const EB_BUCKET_NAME = `napse-eb-bucket${
+  process.env.NODE_ENV === 'production' ? '' : '-dev'
+}`
+export const EB_APP_NAME = `napse${
+  process.env.NODE_ENV === 'production' ? '' : '-dev'
+}`
 export const EB_APP_DESCRIPTION = 'No description'
-export const EB_ENV_NAME = 'napse-env'
-export const IAM_ROLE_NAME_SERVICE_ROLE = 'napse-iam-service-role'
-export const IAM_ROLE_NAME_EC2_ROLE = 'napse-iam-ec2-role'
-export const IAM_INSTANCE_PROFILE_NAME = 'napse-iam-instance-profile'
+export const EB_ENV_NAME = `napse-env${
+  process.env.NODE_ENV === 'production' ? '' : '-dev'
+}`
+export const IAM_ROLE_NAME_SERVICE_ROLE = `napse-iam-service-role${
+  process.env.NODE_ENV === 'production' ? '' : '-dev'
+}`
+export const IAM_ROLE_NAME_EC2_ROLE = `napse-iam-ec2-role${
+  process.env.NODE_ENV === 'production' ? '' : '-dev'
+}`
+export const IAM_INSTANCE_PROFILE_NAME = `napse-iam-instance-profile${
+  process.env.NODE_ENV === 'production' ? '' : '-dev'
+}`
 
+console.log('EB_BUCKET_NAME', EB_BUCKET_NAME)
 export default async function Main(
   secrets: {
     AWS__API_TOKEN: string

diff --git a/desktop-app/main/helpers/aws/fullCleanupAWS.ts b/desktop-app/main/helpers/aws/fullCleanupAWS.ts
@@ -24,6 +24,7 @@ export default async function Main(
     AWS__API_SECRET: string
     AWS__REGION: string
   },
+  deleteData: boolean,
   mainWindow: BrowserWindow
 ) {
   updateStatus(mainWindow, 'fullReset', 'START')
@@ -101,7 +102,9 @@ export default async function Main(
   await deleteIAMRole(secrets, mainWindow, IAM_ROLE_NAME_SERVICE_ROLE)
   updateStatus(mainWindow, 'fullReset', 'deleteEBApp')
   await deleteEBApp(secrets, mainWindow, EB_APP_NAME)
-  updateStatus(mainWindow, 'fullReset', 'deleteBucket')
-  await deleteBucket(secrets, mainWindow, EB_BUCKET_NAME)
+  if (deleteData) {
+    updateStatus(mainWindow, 'fullReset', 'deleteBucket')
+    await deleteBucket(secrets, mainWindow, EB_BUCKET_NAME)
+  }
   updateStatus(mainWindow, 'fullReset', 'END')
 }
diff --git a/desktop-app/main/helpers/utils/updateStatus.ts b/desktop-app/main/helpers/utils/updateStatus.ts
@@ -197,7 +197,7 @@ const SATUS = {
       busy: true
     },
     END: {
-      description: 'Full reset complete, see you soon!',
+      description: 'Reset complete, see you soon!',
       busy: false
     }
   }
@@ -219,6 +219,7 @@ export default async function Main<T extends keyof typeof SATUS>(
     busy: errorMessage ? false : (SATUS[stage][step] as StatusStep).busy,
     progress: (index / (Object.keys(SATUS[stage]).length - 1)) * 100,
     errorMessage: errorMessage,
-    extraData: extraData
+    extraData: extraData,
+    step: step
   })
 }
diff --git a/desktop-app/package.json b/desktop-app/package.json
@@ -3,12 +3,18 @@
   "name": "napse",
   "description": "Napse Desktop App",
   "homepage": "https://napse-invest.com",
-  "version": "1.0.0",
+  "version": "1.4.0",
   "author": "Napse Invest <napse.invest@gmail.com>",
   "main": "app/background.js",
   "scripts": {
     "start": "nextron",
     "build": "nextron build",
+    "build:mac": "nextron build --mac",
+    "build:mac:universal": "nextron build --mac --universal",
+    "build:linux": "nextron build --linux",
+    "build:win32": "nextron build --win --ia32",
+    "build:win64": "nextron build --win --x64",
+    "build:all": "nextron build --mac --linux --win --x64",
     "postinstall": "electron-builder install-app-deps",
     "lint": "next lint"
   },

diff --git a/desktop-app/renderer/api/exchangeAccounts/exchangeAccount.ts b/desktop-app/renderer/api/exchangeAccounts/exchangeAccount.ts
@@ -8,11 +8,14 @@ export interface BaseExchangeAccount {
   description: string
   exchange: string
   testing: boolean
+  privateKey: string
+  publicKey: string
 }
 export interface ExchangeAccount extends BaseExchangeAccount {
   uuid: string
 }
-export interface RetreivedExchangeAccount extends ExchangeAccount {}
+export interface RetreivedExchangeAccount
+  extends Omit<Omit<ExchangeAccount, 'privateKey'>, 'publicKey'> {}
 
 export async function getExchangeAccount(
   searchParams: ReturnType<typeof useSearchParams>,

diff --git a/desktop-app/renderer/components/custom/selectedObject/inputs.tsx b/desktop-app/renderer/components/custom/selectedObject/inputs.tsx
@@ -229,10 +229,14 @@ export default function CustomForm<T extends Object>({
             ) : (
               <Button
                 type="submit"
-                onClick={(e) => {
-                  console.log('props', e)
+                onClick={async (e) => {
                   setIsLoading(true)
-                  return form.handleSubmit(onSubmit)(e)
+                  const submit = form.handleSubmit(onSubmit)(e)
+
+                  await new Promise((resolve) => setTimeout(resolve, 400))
+                  setIsLoading(false)
+
+                  return submit
                 }}
               >
                 {buttonDescription ?? 'Submit'}

diff --git a/desktop-app/renderer/components/layout/breadcrumb.tsx b/desktop-app/renderer/components/layout/breadcrumb.tsx
@@ -1,5 +1,5 @@
 import {
-  ExchangeAccount,
+  RetreivedExchangeAccount,
   getExchangeAccount
 } from '@/api/exchangeAccounts/exchangeAccount'
 import { RetrievedNapseSpace, retrieveSpace } from '@/api/spaces/spaces'
@@ -22,7 +22,8 @@ export default function BreadcrumbLayout() {
   const bot = searchParams.get('bot') || ''
   const server = getServer(serverID)
 
-  const [exchangeAccount, setExchangeAccount] = useState<ExchangeAccount>()
+  const [exchangeAccount, setExchangeAccount] =
+    useState<RetreivedExchangeAccount>()
   useEffect(() => {
     const fetchData = async () => {
       try {

diff --git a/desktop-app/renderer/pages/exchangeAccounts/createExchangeAccountDialog.tsx b/desktop-app/renderer/pages/exchangeAccounts/createExchangeAccountDialog.tsx
@@ -25,7 +25,9 @@ const defaultExchangeAccount: BaseExchangeAccount = {
   name: 'My Exchange Account',
   description: 'My Exchange Account Description',
   testing: true,
-  exchange: 'BINANCE'
+  exchange: 'BINANCE',
+  privateKey: '',
+  publicKey: ''
 }
 
 export default function CreateExchangeAccountDialog({
@@ -41,9 +43,7 @@ export default function CreateExchangeAccountDialog({
 }): JSX.Element {
   const searchParams = useSearchParams()
   const [possibleExchanges, setPossibleExchanges] = useState<string[]>([])
-  const [exchangeAccount, setExchangeAccount] = useState<BaseExchangeAccount>(
-    defaultExchangeAccount
-  )
+
   useEffect(() => {
     const fetchPossibleExchanges = async () => {
       try {
@@ -118,6 +118,20 @@ export default function CreateExchangeAccountDialog({
               type: 'switch',
               zod: z.boolean(),
               default: defaultExchangeAccount.testing
+            },
+            {
+              label: 'Public API Key',
+              key: 'publicKey',
+              type: 'input',
+              zod: z.string(),
+              default: defaultExchangeAccount.publicKey
+            },
+            {
+              label: 'Private API Key',
+              key: 'privateKey',
+              type: 'input',
+              zod: z.string(),
+              default: defaultExchangeAccount.privateKey
             }
           ]}
           onSubmit={async (values) => {