fix: lift electron into root and resolve comments

valory-xyz · Feb 6, 2024 · 7803ae3 · 7803ae3
1 parent 991bfd9
commit 7803ae3
Show file tree

Hide file tree

Showing 46 changed files with 217 additions and 107 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,25 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "next/core-web-vitals",
+    "plugin:jest/recommended",
+    "plugin:react-hooks/recommended",
+    "plugin:react/recommended",
+    "prettier"
+  ],
+  "globals": {
+    "JSX": true,
+    "React": true
+  },
+  "plugins": [
+    "jest",
+    "prettier",
+    "react",
+    "react-hooks"
+  ],
+  "rules": {
+    "react/jsx-props-no-spreading": "off",
+    "react/no-array-index-key": "off",
+    "react/react-in-jsx-scope": "off"
+  }
+}
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,37 @@
-data/
-__pycache__/
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+.yarn/install-state.gz
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
diff --git a/README.md b/README.md
@@ -1 +1,19 @@
-# olas-operate-app
+Frontend Electron + NextJS application for the Olas Operate App.
+
+## Technologies Used
+- NextJS
+- Electron
+- AntD
+- TypeScript
+
+
+## Getting Started
+
+First, run the development server:
+
+```bash
+yarn dev
+```
+
+
+
diff --git a/frontend/components/Layout/Layout.tsx → components/Layout/Layout.tsx b/frontend/components/Layout/Layout.tsx → components/Layout/Layout.tsx
diff --git a/frontend/components/Layout/Navbar/Navbar.tsx → components/Layout/Navbar/Navbar.tsx b/frontend/components/Layout/Navbar/Navbar.tsx → components/Layout/Navbar/Navbar.tsx
diff --git a/...nd/components/Marketplace/Marketplace.tsx → components/Marketplace/Marketplace.tsx b/...nd/components/Marketplace/Marketplace.tsx → components/Marketplace/Marketplace.tsx
diff --git a/...omponents/Marketplace/MarketplaceItem.tsx → components/Marketplace/MarketplaceItem.tsx b/...omponents/Marketplace/MarketplaceItem.tsx → components/Marketplace/MarketplaceItem.tsx
@@ -1,12 +1,10 @@
-import { useAgents } from "@/hooks/useAgents";
 import { Row, Col, Button } from "antd";
-
+import Image from "next/image";
 export const MarketplaceItem = () => {
-  const { startAgent: runAgent } = useAgents();
   return (
-    <Row style={{ borderBottom: "1px solid black" }} gutter={16}>
+    <Row gutter={16}>
       <Col span={8}>
-        <img
+        <Image
           src=""
           alt="Image"
           style={{

diff --git a/frontend/components/Spawn/SpawnDone.tsx → components/Spawn/SpawnDone.tsx b/frontend/components/Spawn/SpawnDone.tsx → components/Spawn/SpawnDone.tsx
diff --git a/frontend/components/Spawn/SpawnFunds.tsx → components/Spawn/SpawnFunds.tsx b/frontend/components/Spawn/SpawnFunds.tsx → components/Spawn/SpawnFunds.tsx
diff --git a/frontend/components/Spawn/SpawnHeader.tsx → components/Spawn/SpawnHeader.tsx b/frontend/components/Spawn/SpawnHeader.tsx → components/Spawn/SpawnHeader.tsx
diff --git a/...nents/Spawn/SpawnRPC/GetNodiesAccount.tsx → ...nents/Spawn/SpawnRPC/GetNodiesAccount.tsx b/...nents/Spawn/SpawnRPC/GetNodiesAccount.tsx → ...nents/Spawn/SpawnRPC/GetNodiesAccount.tsx
diff --git a/...nd/components/Spawn/SpawnRPC/SpawnRPC.tsx → components/Spawn/SpawnRPC/SpawnRPC.tsx b/...nd/components/Spawn/SpawnRPC/SpawnRPC.tsx → components/Spawn/SpawnRPC/SpawnRPC.tsx
diff --git a/...ts/Timeline/TimelineItem/TimelineItem.tsx → ...ts/Timeline/TimelineItem/TimelineItem.tsx b/...ts/Timeline/TimelineItem/TimelineItem.tsx → ...ts/Timeline/TimelineItem/TimelineItem.tsx
@@ -1,4 +1,4 @@
-export const TimelineItem = ({title, body}: {title: string, body: JSX.Element}) => {
+export const TimelineItem = ({ title, body }: { title: string, body: JSX.Element }) => {
     return (
         <div>
             <h1>{title}</h1>

diff --git a/...tend/components/YourAgents/YourAgents.tsx → components/YourAgents/YourAgents.tsx b/...tend/components/YourAgents/YourAgents.tsx → components/YourAgents/YourAgents.tsx
@@ -1,6 +1,6 @@
 import { useAgents } from "@/hooks/useAgents";
 import { Tab, useTabs } from "@/hooks/useTabs";
-import { Button, Flex } from "antd";
+import { Button, Flex, Typography } from "antd";
 
 export const YourAgents = () => {
   const { agents } = useAgents();
@@ -16,8 +16,8 @@ export const HasAgents = ({ agents }: { agents: any[] }) => {
     <>
       {agents.map((agent) => (
         <div key={agent.id}>
-          <h2>{agent.name}</h2>
-          <p>{agent.description}</p>
+          <Typography.Title>{agent.name}</Typography.Title>
+          <Typography.Paragraph>{agent.description}</Typography.Paragraph>
           <Button onClick={() => stopAgent(agent.id)}>Stop this agent</Button>
         </div>
       ))}

diff --git a/frontend/context/AgentsProvider.tsx → context/AgentsProvider.tsx b/frontend/context/AgentsProvider.tsx → context/AgentsProvider.tsx
@@ -16,7 +16,7 @@ type AgentContextType = {
 
 export const AgentsContext = createContext<AgentContextType>({
   agents: [],
-  setAgents: () => {},
+  setAgents: () => { },
   isLoading: false,
 });
 

diff --git a/frontend/context/SpawnContext.tsx → context/SpawnContext.tsx b/frontend/context/SpawnContext.tsx → context/SpawnContext.tsx
diff --git a/frontend/context/TabsProvider.tsx → context/TabsProvider.tsx b/frontend/context/TabsProvider.tsx → context/TabsProvider.tsx
diff --git a/frontend/electron/icons/robot-head.png → electron/icons/robot-head.png b/frontend/electron/icons/robot-head.png → electron/icons/robot-head.png
diff --git a/frontend/electron/loading.html → electron/loading.html b/frontend/electron/loading.html → electron/loading.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>Operate App</title>
 </head>
 <body>
     <img src="/robot-head.png" alt="">

diff --git a/frontend/electron/main.js → electron/main.js b/frontend/electron/main.js → electron/main.js
@@ -1,10 +1,10 @@
 const { app, BrowserWindow, Tray, Menu } = require("electron");
 const path = require("path");
 
-let tray; 
+let tray, win; 
 
 const createWindow = () => {
-  const win = new BrowserWindow({
+  win = new BrowserWindow({
     width: 800,
     height: 600,
   });
@@ -14,7 +14,7 @@ const createWindow = () => {
 
     win.loadURL("http://localhost:3000");
     win.webContents.openDevTools();
-    win.webContents.on("did-fail-load", (e, code, desc) => {
+    win.webContents.on("did-fail-load", () => {
       win.webContents.reloadIgnoringCache();
     });
 
@@ -64,7 +64,7 @@ app.whenReady().then(() => {
       },
     },
   ]);
-  tray.setToolTip("This is my application.");
+  tray.setToolTip("Olas Operate");
   tray.setContextMenu(contextMenu);
   tray.on("click", () => {
     win.show();

diff --git a/frontend/enums/SpawnState.ts → enums/SpawnState.ts b/frontend/enums/SpawnState.ts → enums/SpawnState.ts
diff --git a/frontend/.eslintrc.json b/frontend/.eslintrc.json
diff --git a/frontend/.gitignore b/frontend/.gitignore
diff --git a/frontend/README.md b/frontend/README.md
diff --git a/frontend/components/Layout/Layout.test.tsx b/frontend/components/Layout/Layout.test.tsx
diff --git a/frontend/hooks/useAgents.tsx → hooks/useAgents.tsx b/frontend/hooks/useAgents.tsx → hooks/useAgents.tsx
diff --git a/frontend/hooks/useSpawn.tsx → hooks/useSpawn.tsx b/frontend/hooks/useSpawn.tsx → hooks/useSpawn.tsx
diff --git a/frontend/hooks/useTabs.tsx → hooks/useTabs.tsx b/frontend/hooks/useTabs.tsx → hooks/useTabs.tsx
diff --git a/frontend/jest.config.ts → jest.config.ts b/frontend/jest.config.ts → jest.config.ts
diff --git a/frontend/next.config.mjs → next.config.mjs b/frontend/next.config.mjs → next.config.mjs
diff --git a/frontend/package.json → package.json b/frontend/package.json → package.json
@@ -24,8 +24,12 @@
     "eslint": "^8",
     "eslint-config-next": "14.1.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-jest": "^27.6.3",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
+    "portfinder": "^1.0.32",
     "prettier": "^3.2.5",
     "ts-node": "^10.9.2",
     "tslint-plugin-prettier": "^2.3.0",
@@ -35,8 +39,11 @@
   "name": "olas-operate-app",
   "private": true,
   "scripts": {
-    "build": "next build && electron-builder",
-    "dev": "concurrently -n \"NEXT,ELECTRON\" -c \"yellow,blue\" --kill-others \"next dev\" \"electron .\"",
+    "build": "",
+    "dev": "concurrently -n \"NEXT,ELECTRON,FLASK\" -c \"yellow,blue,green\" --kill-others \"next dev\" \"electron .\" \"python backend/server.py\"",
+    "install": "yarn install:javascript && yarn install:python",
+    "install:javascript": "yarn install --ignore-scripts",
+    "install:python": "cd ./backend && poetry install",
     "lint": "next lint",
     "start": "next start",
     "test": "jest"

diff --git a/frontend/pages/_app.tsx → pages/_app.tsx b/frontend/pages/_app.tsx → pages/_app.tsx
diff --git a/frontend/pages/_document.tsx → pages/_document.tsx b/frontend/pages/_document.tsx → pages/_document.tsx
diff --git a/frontend/pages/api/agents/[id].tsx → pages/agents/[id].tsx b/frontend/pages/api/agents/[id].tsx → pages/agents/[id].tsx
diff --git a/frontend/pages/api/agents/index.tsx → pages/agents/index.tsx b/frontend/pages/api/agents/index.tsx → pages/agents/index.tsx
diff --git a/frontend/pages/api/agents/run.tsx → pages/agents/run.tsx b/frontend/pages/api/agents/run.tsx → pages/agents/run.tsx
diff --git a/frontend/pages/api/agents/stop.tsx → pages/agents/stop.tsx b/frontend/pages/api/agents/stop.tsx → pages/agents/stop.tsx
diff --git a/frontend/pages/index.tsx → pages/index.tsx b/frontend/pages/index.tsx → pages/index.tsx
diff --git a/frontend/pages/spawn/[id].tsx → pages/spawn/[id].tsx b/frontend/pages/spawn/[id].tsx → pages/spawn/[id].tsx
diff --git a/frontend/public/favicon.ico → public/favicon.ico b/frontend/public/favicon.ico → public/favicon.ico
diff --git a/frontend/public/next.svg → public/next.svg b/frontend/public/next.svg → public/next.svg
diff --git a/frontend/public/robot-head.png → public/robot-head.png b/frontend/public/robot-head.png → public/robot-head.png
diff --git a/frontend/public/vercel.svg → public/vercel.svg b/frontend/public/vercel.svg → public/vercel.svg
diff --git a/frontend/styles/globals.css → styles/globals.css b/frontend/styles/globals.css → styles/globals.css
diff --git a/frontend/tsconfig.json → tsconfig.json b/frontend/tsconfig.json → tsconfig.json
@@ -23,11 +23,12 @@
     "strict": true
   },
   "exclude": [
+    "backend",
     "node_modules"
   ],
   "include": [
     "**/*.ts",
     "**/*.tsx",
     "next-env.d.ts"
   ]
-}
+}